Skip to content

Commit 8bfe622

Browse files
committed
net: usb: smsc75xx: Move packet length check to prevent kernel panic in skb_pull
jira LE-4311 cve CVE-2023-53125 Rebuild_History Non-Buildable kernel-5.14.0-570.46.1.el9_6 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: Jonathan Maple <[email protected]>
1 parent a20b75e commit 8bfe622

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

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

0 commit comments

Comments
 (0)