Commit e025909a authored Apr 02, 2021 by Dan Carpenter Committed by Greg Kroah-Hartman May 22, 2021

nfc: pn533: prevent potential memory corruption



[ 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: c3b1e1e8 ("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>

parent a3e351fa

drivers/nfc/pn533/pn533.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -692,6 +692,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;
		}