[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CABXOdTcKkjYRKfiaNH5TGeh1AiyddHLFZF+iJmCa8cC4w_d+Og@mail.gmail.com>
Date: Fri, 18 Nov 2022 14:13:34 -0800
From: Guenter Roeck <groeck@...gle.com>
To: Martin Faltesek <mfaltesek@...gle.com>
Cc: kuba@...nel.org, netdev@...r.kernel.org, linux-nfc@...ts.01.org,
krzysztof.kozlowski@...aro.org, davem@...emloft.net,
martin.faltesek@...il.com, christophe.ricard@...il.com,
jordy@...ing.systems, krzk@...nel.org, sameo@...ux.intel.com,
theflamefire89@...il.com, duoming@....edu.cn,
Denis Efremov <denis.e.efremov@...cle.com>
Subject: Re: [PATCH net 1/3] nfc: st-nci: fix incorrect validating logic in EVT_TRANSACTION
On Fri, Nov 18, 2022 at 2:04 PM Martin Faltesek <mfaltesek@...gle.com> wrote:
>
> 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 ||.
>
> Reported-by: Denis Efremov <denis.e.efremov@...cle.com>
> Fixes: 5d1ceb7f5e56 ("NFC: st21nfcb: Add HCI transaction event support")
> Signed-off-by: Martin Faltesek <mfaltesek@...gle.com>
Reviewed-by: Guenter Roeck <groeck@...gle.com>
> ---
> drivers/nfc/st-nci/se.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/nfc/st-nci/se.c b/drivers/nfc/st-nci/se.c
> index 7764b1a4c3cf..589e1dec78e7 100644
> --- a/drivers/nfc/st-nci/se.c
> +++ b/drivers/nfc/st-nci/se.c
> @@ -326,7 +326,7 @@ static int st_nci_hci_connectivity_event_received(struct nci_dev *ndev,
> * 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.38.1.584.g0f3c55d4c2-goog
>
Powered by blists - more mailing lists