Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2146a57e authored by Martin Faltesek's avatar Martin Faltesek Committed by Greg Kroah-Hartman
Browse files

nfc: st21nfca: fix incorrect validating logic in EVT_TRANSACTION 



commit 77e5fe8f176a525523ae091d6fd0fbb8834c156d upstream.

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: 26fc6c7f ("NFC: st21nfca: Add HCI transaction event support")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarMartin Faltesek <mfaltesek@google.com>
Reviewed-by: default avatarGuenter Roeck <groeck@chromium.org>
Reviewed-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 50277322

drivers/nfc/st21nfca/se.c

+1 −1
Original line number Diff line number Diff line
@@ -330,7 +330,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;