netdev - [PATCH net v3 1/3] nfc: st21nfca: 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: <20220607025729.1673212-2-mfaltesek@google.com>
Date:   Mon,  6 Jun 2022 21:57:27 -0500
From:   Martin Faltesek <mfaltesek@...gle.com>
To:     kuba@...nel.org, krzysztof.kozlowski@...aro.org
Cc:     christophe.ricard@...il.com, gregkh@...uxfoundation.org,
        groeck@...gle.com, jordy@...ing.systems, krzk@...nel.org,
        mfaltesek@...gle.com, martin.faltesek@...il.com,
        netdev@...r.kernel.org, linux-nfc@...ts.01.org,
        sameo@...ux.intel.com, wklin@...gle.com, theflamefire89@...il.com,
        stable@...r.kernel.org
Subject: [PATCH net v3 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")
Cc: stable@...r.kernel.org
Signed-off-by: Martin Faltesek <mfaltesek@...gle.com>
---
 drivers/nfc/st21nfca/se.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/nfc/st21nfca/se.c b/drivers/nfc/st21nfca/se.c
index 7e213f8ddc98..9645777f2544 100644
--- a/drivers/nfc/st21nfca/se.c
+++ b/drivers/nfc/st21nfca/se.c
@@ -315,7 +315,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;
 
-- 
2.36.1.255.ge46751e96f-goog