mirrors/flipperzero-firmware
1
Fork 0
mirror of https://github.com/flipperdevices/flipperzero-firmware.git synced 2025-12-12 04:41:26 +04:00
Code Issues Activity

NFC: Fix crash on ISO15693-3 save when memory is empty or cannot be read (#4165)

Browse Source 
* NFC: Possibly fix ISO15693-3 save crash with no data

* Also prevent malloc(0) if block size or count is 0

---------

Co-authored-by: hedger <hedger@users.noreply.github.com>
This commit is contained in:
WillyJL
2025-03-31 16:59:12 +00:00
committed by GitHub
parent 6962e9ce34
commit 17759a9e4b
3 changed files with 45 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
applications/main/nfc/helpers/protocol_support/iso15693_3/iso15693_3_render.c
View File

@@ -37,11 +37,13 @@ void nfc_render_iso15693_3_brief(const Iso15693_3Data* data, FuriString* str) {
} }
void nfc_render_iso15693_3_system_info(const Iso15693_3Data* data, FuriString* str) { void nfc_render_iso15693_3_system_info(const Iso15693_3Data* data, FuriString* str) {
if(data->system_info.flags & ISO15693_3_SYSINFO_FLAG_MEMORY) { const uint16_t block_count = iso15693_3_get_block_count(data);
const uint8_t block_size = iso15693_3_get_block_size(data);
if((data->system_info.flags & ISO15693_3_SYSINFO_FLAG_MEMORY) &&
(block_count > 0 && block_size > 0)) {
furi_string_cat(str, "\e#Memory data\n\e*--------------------\n"); furi_string_cat(str, "\e#Memory data\n\e*--------------------\n");
const uint16_t block_count = iso15693_3_get_block_count(data);
const uint8_t block_size = iso15693_3_get_block_size(data);
const uint16_t display_block_count = const uint16_t display_block_count =
MIN(NFC_RENDER_ISO15693_3_MAX_BYTES / block_size, block_count); MIN(NFC_RENDER_ISO15693_3_MAX_BYTES / block_size, block_count);

68
lib/nfc/protocols/iso15693_3/iso15693_3.c
View File

@@ -173,33 +173,35 @@ bool iso15693_3_load(Iso15693_3Data* data, FlipperFormat* ff, uint32_t version)
if(flipper_format_key_exist(ff, ISO15693_3_BLOCK_COUNT_KEY) && if(flipper_format_key_exist(ff, ISO15693_3_BLOCK_COUNT_KEY) &&
flipper_format_key_exist(ff, ISO15693_3_BLOCK_SIZE_KEY)) { flipper_format_key_exist(ff, ISO15693_3_BLOCK_SIZE_KEY)) {
data->system_info.flags |= ISO15693_3_SYSINFO_FLAG_MEMORY;
uint32_t block_count; uint32_t block_count;
if(!flipper_format_read_uint32(ff, ISO15693_3_BLOCK_COUNT_KEY, &block_count, 1)) break; if(!flipper_format_read_uint32(ff, ISO15693_3_BLOCK_COUNT_KEY, &block_count, 1)) break;
data->system_info.block_count = block_count; data->system_info.block_count = block_count;
data->system_info.flags |= ISO15693_3_SYSINFO_FLAG_MEMORY;
if(!flipper_format_read_hex( if(!flipper_format_read_hex(
ff, ISO15693_3_BLOCK_SIZE_KEY, &(data->system_info.block_size), 1)) ff, ISO15693_3_BLOCK_SIZE_KEY, &(data->system_info.block_size), 1))
break; break;
simple_array_init( if(data->system_info.block_count > 0 && data->system_info.block_size > 0) {
data->block_data, data->system_info.block_size * data->system_info.block_count); simple_array_init(
data->block_data,
if(!flipper_format_read_hex( data->system_info.block_size * data->system_info.block_count);
ff,
ISO15693_3_DATA_CONTENT_KEY,
simple_array_get_data(data->block_data),
simple_array_get_count(data->block_data)))
break;
if(flipper_format_key_exist(ff, ISO15693_3_SECURITY_STATUS_KEY)) {
simple_array_init(data->block_security, data->system_info.block_count); simple_array_init(data->block_security, data->system_info.block_count);
const bool security_loaded = has_lock_bits ? if(!flipper_format_read_hex(
iso15693_3_load_security(data, ff) : ff,
iso15693_3_load_security_legacy(data, ff); ISO15693_3_DATA_CONTENT_KEY,
if(!security_loaded) break; simple_array_get_data(data->block_data),
simple_array_get_count(data->block_data)))
break;
if(flipper_format_key_exist(ff, ISO15693_3_SECURITY_STATUS_KEY)) {
const bool security_loaded = has_lock_bits ?
iso15693_3_load_security(data, ff) :
iso15693_3_load_security_legacy(data, ff);
if(!security_loaded) break;
}
} }
} }
@@ -260,22 +262,24 @@ bool iso15693_3_save(const Iso15693_3Data* data, FlipperFormat* ff) {
ff, ISO15693_3_BLOCK_SIZE_KEY, &data->system_info.block_size, 1)) ff, ISO15693_3_BLOCK_SIZE_KEY, &data->system_info.block_size, 1))
break; break;
if(!flipper_format_write_hex( if(data->system_info.block_count > 0 && data->system_info.block_size > 0) {
ff, if(!flipper_format_write_hex(
ISO15693_3_DATA_CONTENT_KEY, ff,
simple_array_cget_data(data->block_data), ISO15693_3_DATA_CONTENT_KEY,
simple_array_get_count(data->block_data))) simple_array_cget_data(data->block_data),
break; simple_array_get_count(data->block_data)))
break;
if(!flipper_format_write_comment_cstr( if(!flipper_format_write_comment_cstr(
ff, "Block Security Status: 01 = locked, 00 = not locked")) ff, "Block Security Status: 01 = locked, 00 = not locked"))
break; break;
if(!flipper_format_write_hex( if(!flipper_format_write_hex(
ff, ff,
ISO15693_3_SECURITY_STATUS_KEY, ISO15693_3_SECURITY_STATUS_KEY,
simple_array_cget_data(data->block_security), simple_array_cget_data(data->block_security),
simple_array_get_count(data->block_security))) simple_array_get_count(data->block_security)))
break; break;
}
} }
saved = true; saved = true;
} while(false); } while(false);

8
lib/nfc/protocols/iso15693_3/iso15693_3_poller_i.c
View File

@@ -100,10 +100,12 @@ Iso15693_3Error iso15693_3_poller_activate(Iso15693_3Poller* instance, Iso15693_
break; break;
} }
if(system_info->block_count > 0) { if(system_info->block_count > 0 && system_info->block_size > 0) {
// Read blocks: Optional command
simple_array_init( simple_array_init(
data->block_data, system_info->block_count * system_info->block_size); data->block_data, system_info->block_count * system_info->block_size);
simple_array_init(data->block_security, system_info->block_count);
// Read blocks: Optional command
ret = iso15693_3_poller_read_blocks( ret = iso15693_3_poller_read_blocks(
instance, instance,
simple_array_get_data(data->block_data), simple_array_get_data(data->block_data),
@@ -115,8 +117,6 @@ Iso15693_3Error iso15693_3_poller_activate(Iso15693_3Poller* instance, Iso15693_
} }
// Get block security status: Optional command // Get block security status: Optional command
simple_array_init(data->block_security, system_info->block_count);
ret = iso15693_3_poller_get_blocks_security( ret = iso15693_3_poller_get_blocks_security(
instance, simple_array_get_data(data->block_security), system_info->block_count); instance, simple_array_get_data(data->block_security), system_info->block_count);
if(ret != Iso15693_3ErrorNone) { if(ret != Iso15693_3ErrorNone) {