From: Simon Horman <horms@kernel.org>
To: Jeremy Cline <jeremy@jcline.org>
Cc: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
syzbot+0839b78e119aae1fec78@syzkaller.appspotmail.com,
"John W. Linville" <linville@tuxdriver.com>,
Ilan Elias <ilane@ti.com>, Dmitry Vyukov <dvyukov@google.com>,
Lin Ma <linma@zju.edu.cn>
Subject: Re: [PATCH] nfc: nci: assert requested protocol is valid
Date: Thu, 7 Sep 2023 16:41:12 +0200 [thread overview]
Message-ID: <20230907144112.GB434333@kernel.org> (raw)
In-Reply-To: <20230906233347.823171-1-jeremy@jcline.org>
Cc "John W. Linville" <linville@tuxdriver.com>
Ilan Elias <ilane@ti.com>
Dmitry Vyukov <dvyukov@google.com>
Lin Ma <linma@zju.edu.cn>
On Wed, Sep 06, 2023 at 07:33:47PM -0400, Jeremy Cline wrote:
> The protocol is used in a bit mask to determine if the protocol is
> supported. Assert the provided protocol is less than the maximum
> defined so it doesn't potentially perform a shift-out-of-bounds and
> provide a clearer error for undefined protocols vs unsupported ones.
>
> Fixes: 6a2968aaf50c ("NFC: basic NCI protocol implementation")
> Reported-and-tested-by: syzbot+0839b78e119aae1fec78@syzkaller.appspotmail.com
> Closes: https://syzkaller.appspot.com/bug?extid=0839b78e119aae1fec78
> Signed-off-by: Jeremy Cline <jeremy@jcline.org>
Hi Jeremy,
As a bug fix, with a Fixes tag, I'm assuming that this targets 'net'.
As opposed to 'net-next'.
There is probably no need to repost for this, but in future please
bear in mind the practice of specifying the target tree in
the subject of Networking patches.
Subject: [PATCH net] ...
Also, please include addresses indicated by the following in the CC list.
get_maintainer.pl --min-percent 25 x.patch
The above notwithstanding, this looks good to me.
Reviewed-by: Simon Horman <horms@kernel.org>
> ---
> net/nfc/nci/core.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
> index fff755dde30d..6c9592d05120 100644
> --- a/net/nfc/nci/core.c
> +++ b/net/nfc/nci/core.c
> @@ -909,6 +909,11 @@ static int nci_activate_target(struct nfc_dev *nfc_dev,
> return -EINVAL;
> }
>
> + if (protocol >= NFC_PROTO_MAX) {
> + pr_err("the requested nfc protocol is invalid\n");
> + return -EINVAL;
> + }
> +
> if (!(nci_target->supported_protocols & (1 << protocol))) {
> pr_err("target does not support the requested protocol 0x%x\n",
> protocol);
> --
> 2.41.0
>
>
next prev parent reply other threads:[~2023-09-07 14:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-06 23:33 [PATCH] nfc: nci: assert requested protocol is valid Jeremy Cline
2023-09-07 6:24 ` Krzysztof Kozlowski
2023-09-07 12:41 ` Jeremy Cline
2023-09-07 14:41 ` Simon Horman [this message]
2023-09-08 1:01 ` Jeremy Cline
2023-10-09 20:00 ` [PATCH v2 net] " Jeremy Cline
2023-10-11 15:37 ` Simon Horman
2023-10-12 7:40 ` patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230907144112.GB434333@kernel.org \
--to=horms@kernel.org \
--cc=davem@davemloft.net \
--cc=dvyukov@google.com \
--cc=edumazet@google.com \
--cc=ilane@ti.com \
--cc=jeremy@jcline.org \
--cc=krzysztof.kozlowski@linaro.org \
--cc=kuba@kernel.org \
--cc=linma@zju.edu.cn \
--cc=linux-kernel@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=syzbot+0839b78e119aae1fec78@syzkaller.appspotmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).