Skip to content

Commit 43ffe6c

Browse files
szymonhkuba-moo
authored andcommitted
net: usb: smsc75xx: Move packet length check to prevent kernel panic in skb_pull
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: d8b2283 ("net: usb: smsc75xx: Limit packet length to skb->len") Signed-off-by: Szymon Heidrich <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 8a2618e commit 43ffe6c

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
@@ -2200,6 +2200,13 @@ static int smsc75xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
22002200
size = (rx_cmd_a & RX_CMD_A_LEN) - RXW_PADDING;
22012201
align_count = (4 - ((size + RXW_PADDING) % 4)) % 4;
22022202

2203+
if (unlikely(size > skb->len)) {
2204+
netif_dbg(dev, rx_err, dev->net,
2205+
"size err rx_cmd_a=0x%08x\n",
2206+
rx_cmd_a);
2207+
return 0;
2208+
}
2209+
22032210
if (unlikely(rx_cmd_a & RX_CMD_A_RED)) {
22042211
netif_dbg(dev, rx_err, dev->net,
22052212
"Error rx_cmd_a=0x%08x\n", rx_cmd_a);
@@ -2212,8 +2219,7 @@ static int smsc75xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
22122219
dev->net->stats.rx_frame_errors++;
22132220
} else {
22142221
/* MAX_SINGLE_PACKET_SIZE + 4(CRC) + 2(COE) + 4(Vlan) */
2215-
if (unlikely(size > (MAX_SINGLE_PACKET_SIZE + ETH_HLEN + 12) ||
2216-
size > skb->len)) {
2222+
if (unlikely(size > (MAX_SINGLE_PACKET_SIZE + ETH_HLEN + 12))) {
22172223
netif_dbg(dev, rx_err, dev->net,
22182224
"size err rx_cmd_a=0x%08x\n",
22192225
rx_cmd_a);

0 commit comments

Comments
 (0)