This is a note to let you know that I've just added the patch titled
nfc: st21nfca: fix incorrect validating logic in EVT_TRANSACTION
to the 5.17-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
nfc-st21nfca-fix-incorrect-validating-logic-in-evt_transaction.patch
and it can be found in the queue-5.17 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 77e5fe8f176a525523ae091d6fd0fbb8834c156d Mon Sep 17 00:00:00 2001
From: Martin Faltesek <mfaltesek@xxxxxxxxxx>
Date: Mon, 6 Jun 2022 21:57:27 -0500
Subject: nfc: st21nfca: fix incorrect validating logic in EVT_TRANSACTION
From: Martin Faltesek <mfaltesek@xxxxxxxxxx>
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: 26fc6c7f02cb ("NFC: st21nfca: Add HCI transaction event support")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Martin Faltesek <mfaltesek@xxxxxxxxxx>
Reviewed-by: Guenter Roeck <groeck@xxxxxxxxxxxx>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx>
Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/nfc/st21nfca/se.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/nfc/st21nfca/se.c
+++ b/drivers/nfc/st21nfca/se.c
@@ -315,7 +315,7 @@ int st21nfca_connectivity_event_received
* 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;
Patches currently in stable-queue which might be from mfaltesek@xxxxxxxxxx are
queue-5.17/nfc-st21nfca-fix-incorrect-validating-logic-in-evt_transaction.patch
queue-5.17/nfc-st21nfca-fix-memory-leaks-in-evt_transaction-handling.patch
queue-5.17/nfc-st21nfca-fix-incorrect-sizing-calculations-in-evt_transaction.patch
