diff options
| author | Martin Faltesek <mfaltesek@google.com> | 2022-06-06 21:57:27 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-06-14 18:12:02 +0200 |
| commit | 31f9c39b4a378fb971063179ff4cc98a1a806916 (patch) | |
| tree | 245d41c5b843989042b9848fd9f5c79cee0721be | |
| parent | 4f4ab5004633c2206fa306a15f6d68d469a5fbd6 (diff) | |
| download | linux-stable-31f9c39b4a378fb971063179ff4cc98a1a806916.tar.gz linux-stable-31f9c39b4a378fb971063179ff4cc98a1a806916.tar.bz2 linux-stable-31f9c39b4a378fb971063179ff4cc98a1a806916.zip | |
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: 26fc6c7f02cb ("NFC: st21nfca: Add HCI transaction event support")
Cc: stable@vger.kernel.org
Signed-off-by: Martin Faltesek <mfaltesek@google.com>
Reviewed-by: Guenter Roeck <groeck@chromium.org>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/nfc/st21nfca/se.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nfc/st21nfca/se.c b/drivers/nfc/st21nfca/se.c index 5256195f313b..97ec83c6b3e9 100644 --- a/drivers/nfc/st21nfca/se.c +++ b/drivers/nfc/st21nfca/se.c @@ -319,7 +319,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; |