From: Szymon Heidrich <szymon.heidrich@gmail.com>
To: kuba@kernel.org, steve.glendinning@shawell.net,
UNGLinuxDriver@microchip.com, davem@davemloft.net,
edumazet@google.com
Cc: pabeni@redhat.com, szymon.heidrich@gmail.com,
linux-usb@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v2] net: usb: smsc95xx: Limit packet length to skb->len
Date: Thu, 16 Mar 2023 11:19:54 +0100 [thread overview]
Message-ID: <20230316101954.75836-1-szymon.heidrich@gmail.com> (raw)
In-Reply-To: <20230315212425.12cb48ca@kernel.org>
Packet length retrieved from descriptor may be larger than
the actual socket buffer length. In such case the cloned
skb passed up the network stack will leak kernel memory contents.
Fixes: 2f7ca802bdae ("net: Add SMSC LAN9500 USB2.0 10/100 ethernet adapter driver")
Signed-off-by: Szymon Heidrich <szymon.heidrich@gmail.com>
---
V1 -> V2: Move packet length check to prevent kernel panic in skb_pull
drivers/net/usb/smsc95xx.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index 32d2c60d3..563ecd27b 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -1833,6 +1833,12 @@ static int smsc95xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
size = (u16)((header & RX_STS_FL_) >> 16);
align_count = (4 - ((size + NET_IP_ALIGN) % 4)) % 4;
+ if (unlikely(size > skb->len)) {
+ netif_dbg(dev, rx_err, dev->net,
+ "size err header=0x%08x\n", header);
+ return 0;
+ }
+
if (unlikely(header & RX_STS_ES_)) {
netif_dbg(dev, rx_err, dev->net,
"Error header=0x%08x\n", header);
--
2.40.0
next prev parent reply other threads:[~2023-03-16 10:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-13 22:01 [PATCH] net: usb: smsc95xx: Limit packet length to skb->len Szymon Heidrich
2023-03-16 4:24 ` Jakub Kicinski
2023-03-16 10:19 ` Szymon Heidrich [this message]
2023-03-16 20:52 ` [PATCH v2] " Jakub Kicinski
2023-03-18 5:10 ` patchwork-bot+netdevbpf
2023-03-16 11:13 ` [PATCH] " Szymon Heidrich
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=20230316101954.75836-1-szymon.heidrich@gmail.com \
--to=szymon.heidrich@gmail.com \
--cc=UNGLinuxDriver@microchip.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--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=steve.glendinning@shawell.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.