Skip to content

Commit 952261e

Browse files
committed
net: usb: smsc75xx: Move packet length check to prevent kernel panic in skb_pull
jira VULN-67489 cve-bf CVE-2023-53125 commit-author Szymon Heidrich <[email protected]> commit 43ffe6c 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]> (cherry picked from commit 43ffe6c) Signed-off-by: Brett Mastbergen <[email protected]>
1 parent 13b6de6 commit 952261e

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

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

0 commit comments

Comments
 (0)