From: Andrew Lunn <andrew@lunn.ch>
To: Pengpeng Hou <pengpeng@iscas.ac.cn>
Cc: Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Kees Cook <kees@kernel.org>,
linux-usb@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] net: usb: cx82310_eth: bound partial receive continuation
Date: Mon, 6 Jul 2026 17:06:35 +0200 [thread overview]
Message-ID: <8ed2790f-05ab-4c6b-9982-e92a08c6c99d@lunn.ch> (raw)
In-Reply-To: <20260705083609.23977-1-pengpeng@iscas.ac.cn>
On Sun, Jul 05, 2026 at 04:36:09PM +0800, Pengpeng Hou wrote:
> cx82310_rx_fixup() completes a packet that started in the previous URB
> by copying dev->partial_rem bytes from the current skb. It then pulls
> the same continuation extent, rounded up to an even byte count. The code
> does not first prove that the current skb contains that continuation.
>
> Add a fail-closed bound check before the copy and pull. If the
> continuation is shorter than the pending packet state expects, drop that
> pending partial packet before returning so later URBs are not consumed as
> stale continuation bytes. This keeps the existing cross-URB packet
> model, but avoids consuming bytes that are not present in the current
> skb.
Please take a read of:
https://www.kernel.org/doc/html/latest/process/maintainer-netdev.html
The Subject: line is wrong.
How has this been tested?
> static int cx82310_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
> {
> - int len;
> + int len, pull_len;
> struct sk_buff *skb2;
> struct cx82310_priv *priv = dev->driver_priv;
Although the reverse christmas tree is already broken here, you should
try to keep with it, and put the new line at the end.
>
> @@ -251,6 +251,13 @@
> * end of that packet at the beginning.
> */
> if (dev->partial_rem) {
> + pull_len = (dev->partial_rem + 1) & ~1;
> + if (skb->len < pull_len) {
> + dev->partial_len = 0;
> + dev->partial_rem = 0;
> + return 0;
> + }
> +
> len = dev->partial_len + dev->partial_rem;
> skb2 = alloc_skb(len, GFP_ATOMIC);
> if (!skb2)
> @@ -261,7 +265,7 @@
> memcpy(skb2->data + dev->partial_len, skb->data,
> dev->partial_rem);
> usbnet_skb_return(dev, skb2);
> - skb_pull(skb, (dev->partial_rem + 1) & ~1);
> + skb_pull(skb, pull_len);
> dev->partial_rem = 0;
> if (skb->len < 2)
> return 1;
>
next prev parent reply other threads:[~2026-07-06 15:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-05 8:36 [PATCH] net: usb: cx82310_eth: bound partial receive continuation Pengpeng Hou
2026-07-06 15:06 ` Andrew Lunn [this message]
2026-07-07 1:45 ` Pengpeng Hou
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=8ed2790f-05ab-4c6b-9982-e92a08c6c99d@lunn.ch \
--to=andrew@lunn.ch \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kees@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=pengpeng@iscas.ac.cn \
/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