nfc: pn533: prevent potential memory corruption
authorDan Carpenter <dan.carpenter@oracle.com>
Fri, 2 Apr 2021 11:44:42 +0000 (14:44 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 22 May 2021 08:40:26 +0000 (10:40 +0200)
[ Upstream commit ca4d4c34ae9aa5c3c0da76662c5e549d2fc0cc86 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/nfc/pn533/pn533.c

index d9c55830b2b26a1fb67b41562b3b16c0b09f8830..6c495664d2cb79b93fa22e89471880df356b5e38 100644 (file)
@@ -678,6 +678,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;
 }