diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2021-04-02 14:44:42 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2021-04-02 14:27:50 -0700 |
commit | ca4d4c34ae9aa5c3c0da76662c5e549d2fc0cc86 (patch) | |
tree | 3c90130a8db3ff83082850e5349dc0e836006630 | |
parent | 8577dd8a07cc2183e3790aa8f8da3d8c6a87803d (diff) | |
download | linux-stable-ca4d4c34ae9aa5c3c0da76662c5e549d2fc0cc86.tar.gz linux-stable-ca4d4c34ae9aa5c3c0da76662c5e549d2fc0cc86.tar.bz2 linux-stable-ca4d4c34ae9aa5c3c0da76662c5e549d2fc0cc86.zip |
nfc: pn533: prevent potential memory corruption
If the "type_a->nfcid_len" is too large then it would lead to memory
corruption in pn533_target_found_type_a() when we do:
memcpy(nfc_tgt->nfcid1, tgt_type_a->nfcid_data, nfc_tgt->nfcid1_len);
Fixes: c3b1e1e8a76f ("NFC: Export NFCID1 from pn533")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/nfc/pn533/pn533.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/nfc/pn533/pn533.c b/drivers/nfc/pn533/pn533.c index f1469ac8ff42..3fe5b81eda2d 100644 --- a/drivers/nfc/pn533/pn533.c +++ b/drivers/nfc/pn533/pn533.c @@ -706,6 +706,9 @@ static bool pn533_target_type_a_is_valid(struct pn533_target_type_a *type_a, if (PN533_TYPE_A_SEL_CASCADE(type_a->sel_res) != 0) return false; + if (type_a->nfcid_len > NFC_NFCID1_MAXSIZE) + return false; + return true; } |