netdev - [PATCH net v2 1/3] nfc: st-nci: fix incorrect validating logic in EVT

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20221122004246.4186422-2-mfaltesek@google.com>
Date:   Mon, 21 Nov 2022 18:42:44 -0600
From:   Martin Faltesek <mfaltesek@...gle.com>
To:     kuba@...nel.org, netdev@...r.kernel.org, linux-nfc@...ts.01.org,
        krzysztof.kozlowski@...aro.org, davem@...emloft.net
Cc:     martin.faltesek@...il.com, christophe.ricard@...il.com,
        groeck@...gle.com, jordy@...ing.systems, krzk@...nel.org,
        mfaltesek@...gle.com, sameo@...ux.intel.com,
        theflamefire89@...il.com, duoming@....edu.cn,
        Denis Efremov <denis.e.efremov@...cle.com>
Subject: [PATCH net v2 1/3] nfc: st-nci: 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 ||.

Reported-by: Denis Efremov <denis.e.efremov@...cle.com>
Reviewed-by: Guenter Roeck <groeck@...gle.com>
Fixes: 5d1ceb7f5e56 ("NFC: st21nfcb: Add HCI transaction event support")
Signed-off-by: Martin Faltesek <mfaltesek@...gle.com>
---
 drivers/nfc/st-nci/se.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/nfc/st-nci/se.c b/drivers/nfc/st-nci/se.c
index 7764b1a4c3cf..589e1dec78e7 100644
--- a/drivers/nfc/st-nci/se.c
+++ b/drivers/nfc/st-nci/se.c
@@ -326,7 +326,7 @@ static int st_nci_hci_connectivity_event_received(struct nci_dev *ndev,
 		 * 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;
 
-- 
2.38.1.584.g0f3c55d4c2-goog