Skip to contentSkip to conversation

nfc: st21nfca: fix incorrect validating logic in EVT_TRANSACTION

PATCH In review Martin Faltesek 2 participants 2 messages Apr 1, 2022 – Apr 2, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/3 nfc: st21nfca: fix incorrect validating logic in EVT_TRANSACTION

The first validation check for EVT_TRANSACTION has two different checks tied together with logical AND. One is a check for minimum packet length, and the other is for a valid aid_tag. If either condition is true (fails), then an error should be triggered. The fix is to change && to ||.

Fixes 26fc6c7f02cb ("NFC: st21nfca: Add HCI transaction event support")
---
 drivers/nfc/st21nfca/se.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nfc/st21nfca/se.c +1 -1
index c922f10d0d7b..9a37de60f73f 100644
@@ -307,7 +307,7 @@ int st21nfca_connectivity_event_received(struct nfc_hci_dev *hdev, u8 host,
 		 * AID		81	5 to 16
 		 * PARAMETERS	82	0 to 255
 		 */
-		if (skb->len < NFC_MIN_AID_LENGTH + 2 &&
+		if (skb->len < NFC_MIN_AID_LENGTH + 2 ||
 		    skb->data[0] != NFC_EVT_TRANSACTION_AID_TAG)
 			return -EPROTO;
 
Signature · 1 line
2.35.1.1094.g7c7d902a7c-goog
Reviewed-by on v2 1/3
#1 lore raw
Quoted 11 lines · Martin Faltesek

The first validation check for EVT_TRANSACTION has two different checks tied together with logical AND. One is a check for minimum packet length, and the other is for a valid aid_tag. If either condition is true (fails), then an error should be triggered. The fix is to change && to ||.

Fixes 26fc6c7f02cb ("NFC: st21nfca: Add HCI transaction event support")
---
 drivers/nfc/st21nfca/se.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Best regards,
Krzysztof