diff --git a/client/src/cmdhfmfu.c b/client/src/cmdhfmfu.c index 8dae4ba15..85851d059 100644 --- a/client/src/cmdhfmfu.c +++ b/client/src/cmdhfmfu.c @@ -4445,7 +4445,7 @@ static int mfu_3pass_check_keys(uint8_t key_index, uint8_t firstChunk, uint8_t l } PACKED; uint8_t keysize = segment != -1 ? MIFAREU3P_KEY_SIZE / 4 : MIFAREU3P_KEY_SIZE; memcpy(payload.ref_key, ref_key, MIFAREU3P_KEY_SIZE); - if (nkeys * keysize > sizeof(payload.data)) { + if (nkeys * keysize > (uint32_t)(pm3_max_cmd_data_size() - MIFAREU3P_CHKKEY_HEADER)) { PrintAndLogEx(ERR, "Key chunk size exceeds payload size"); return PM3_ESOFT; } diff --git a/client/src/cmdlf.c b/client/src/cmdlf.c index 95e4c171a..83d5cd3bc 100644 --- a/client/src/cmdlf.c +++ b/client/src/cmdlf.c @@ -359,7 +359,7 @@ int CmdLFCommandRead(const char *Cmd) { memset(payload.symbol_extra, 0, sizeof(payload.symbol_extra)); memset(payload.period_extra, 0, sizeof(payload.period_extra)); - if (cmd_len > sizeof(payload.data) - 8 * add_crc_ht - 1) { + if (cmd_len > (size_t)(pm3_max_cmd_data_size() - PAYLOAD_HEADER_SIZE) - 8 * add_crc_ht - 1) { PrintAndLogEx(ERR, "cmd too long, max length is %zu", sizeof(cmd) - 1); return PM3_EINVARG; } diff --git a/client/src/cmdusart.c b/client/src/cmdusart.c index b3e2bdc5d..44c02fb57 100644 --- a/client/src/cmdusart.c +++ b/client/src/cmdusart.c @@ -71,7 +71,7 @@ static int usart_txrx(uint8_t *srcdata, size_t srclen, uint8_t *dstdata, size_t payload.header.waittime = waittime; - if (srclen >= sizeof(payload.data)) { + if (srclen >= (size_t)(pm3_max_cmd_data_size() - sizeof(uint32_t))) { return PM3_EOVFLOW; }