Skip to content

Commit a0aeb3f

Browse files
szymonhAlone0316
authored andcommitted
net: usb: smsc75xx: Move packet length check to prevent kernel panic in skb_pull
[ Upstream commit 43ffe6caccc7a1bb9d7442fbab521efbf6c1378c ] Packet length check needs to be located after size and align_count calculation to prevent kernel panic in skb_pull() in case rx_cmd_a & RX_CMD_A_RED evaluates to true. Fixes: d8b228318935 ("net: usb: smsc75xx: Limit packet length to skb->len") Signed-off-by: Szymon Heidrich <szymon.heidrich@gmail.com> Link: https://lore.kernel.org/r/20230316110540.77531-1-szymon.heidrich@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 91ebd3c commit a0aeb3f

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

drivers/net/usb/smsc75xx.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2214,6 +2214,13 @@ static int smsc75xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
22142214
size = (rx_cmd_a & RX_CMD_A_LEN) - RXW_PADDING;
22152215
align_count = (4 - ((size + RXW_PADDING) % 4)) % 4;
22162216

2217+
if (unlikely(size > skb->len)) {
2218+
netif_dbg(dev, rx_err, dev->net,
2219+
"size err rx_cmd_a=0x%08x\n",
2220+
rx_cmd_a);
2221+
return 0;
2222+
}
2223+
22172224
if (unlikely(rx_cmd_a & RX_CMD_A_RED)) {
22182225
netif_dbg(dev, rx_err, dev->net,
22192226
"Error rx_cmd_a=0x%08x\n", rx_cmd_a);
@@ -2226,8 +2233,7 @@ static int smsc75xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
22262233
dev->net->stats.rx_frame_errors++;
22272234
} else {
22282235
/* MAX_SINGLE_PACKET_SIZE + 4(CRC) + 2(COE) + 4(Vlan) */
2229-
if (unlikely(size > (MAX_SINGLE_PACKET_SIZE + ETH_HLEN + 12) ||
2230-
size > skb->len)) {
2236+
if (unlikely(size > (MAX_SINGLE_PACKET_SIZE + ETH_HLEN + 12))) {
22312237
netif_dbg(dev, rx_err, dev->net,
22322238
"size err rx_cmd_a=0x%08x\n",
22332239
rx_cmd_a);

0 commit comments

Comments
 (0)