mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 22:02:02 +00:00
nfc: st21nfca: fix incorrect validating logic in EVT_TRANSACTION
commit77e5fe8f17
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:26fc6c7f02
("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>
This commit is contained in:
parent
bafbc134f5
commit
73b2876305
1 changed files with 1 additions and 1 deletions
|
@ -319,7 +319,7 @@ int st21nfca_connectivity_event_received(struct nfc_hci_dev *hdev, u8 host,
|
||||||
* AID 81 5 to 16
|
* AID 81 5 to 16
|
||||||
* PARAMETERS 82 0 to 255
|
* 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)
|
skb->data[0] != NFC_EVT_TRANSACTION_AID_TAG)
|
||||||
return -EPROTO;
|
return -EPROTO;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue