From: Ryosuke Yasuoka <ryasuoka@redhat.com>
To: Jakub Kicinski <kuba@kernel.org>
Cc: krzk@kernel.org, davem@davemloft.net, edumazet@google.com,
pabeni@redhat.com, horms@kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, syoshida@redhat.com,
syzbot+d7b4dc6cd50410152534@syzkaller.appspotmail.com
Subject: Re: [PATCH net v4] nfc: nci: Fix uninit-value in nci_rx_work
Date: Sat, 11 May 2024 20:02:28 +0900 [thread overview]
Message-ID: <Zj9QRIjGLbVdd7MX@zeus> (raw)
In-Reply-To: <20240510190613.72838bf0@kernel.org>
Thank you for your review.
On Fri, May 10, 2024 at 07:06:13PM -0700, Jakub Kicinski wrote:
> On Thu, 9 May 2024 20:30:33 +0900 Ryosuke Yasuoka wrote:
> > - if (!nci_plen(skb->data)) {
> > + if (!skb->len) {
> > kfree_skb(skb);
> > - kcov_remote_stop();
> > - break;
> > + continue;
>
> the change from break to continue looks unrelated
OK. I'll leave this break in this patch. I'll send another patch about
it.
> > }
>
> > - nci_ntf_packet(ndev, skb);
> > + if (nci_valid_size(skb, NCI_CTRL_HDR_SIZE))
>
> > + if (nci_valid_size(skb, NCI_DATA_HDR_SIZE))
>
>
> #define NCI_CTRL_HDR_SIZE 3
> #define NCI_DATA_HDR_SIZE 3
>
> you can add a BUILD_BUG_ON(NCI_CTRL_HDR_SIZE == NCI_DATA_HDR_SIZE)
> and save all the code duplication.
>
Sorry I don't get it. Do you mean I just insert
BUILD_BUG_ON(NCI_CTRL_HDR_SIZE != NCI_DATA_HDR_SIZE) or insert this and
clean up the code duplication like this? (It is just a draft. I just
share what I mean.) I can avoid to call nci_valid_size() repeatedly
inside the switch statement.
static void nci_rx_work(struct work_struct *work)
{
...
if (!skb->len) {
kfree_skb(skb);
kcov_remote_stop();
break;
}
BUILD_BUG_ON(NCI_CTRL_HDR_SIZE != NCI_DATA_HDR_SIZE);
unsigned int hdr_size = NCI_CTRL_HDR_SIZE;
if (!nci_valid_size(skb, hdr_size)) {
kfree_skb(skb);
continue;
}
/* Process frame */
switch (nci_mt(skb->data)) {
case NCI_MT_RSP_PKT:
nci_rsp_packet(ndev, skb);
break;
case NCI_MT_NTF_PKT:
nci_ntf_packet(ndev, skb);
break;
next prev parent reply other threads:[~2024-05-11 11:02 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-09 11:30 [PATCH net v4] nfc: nci: Fix uninit-value in nci_rx_work Ryosuke Yasuoka
2024-05-09 13:44 ` Simon Horman
2024-05-09 14:39 ` Krzysztof Kozlowski
2024-05-11 2:06 ` Jakub Kicinski
2024-05-11 11:02 ` Ryosuke Yasuoka [this message]
2024-05-13 14:25 ` Jakub Kicinski
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=Zj9QRIjGLbVdd7MX@zeus \
--to=ryasuoka@redhat.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=krzk@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=syoshida@redhat.com \
--cc=syzbot+d7b4dc6cd50410152534@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 read-only IMAP folder(s) and NNTP newsgroup(s).