Skip to content

Commit d50729f

Browse files
edumazetkuba-moo
authored andcommitted
net: usb: smsc95xx: stop lying about skb->truesize
Some usb drivers try to set small skb->truesize and break core networking stacks. In this patch, I removed one of the skb->truesize override. I also replaced one skb_clone() by an allocation of a fresh and small skb, to get minimally sized skbs, like we did in commit 1e2c611 ("net: cdc_ncm: reduce skb truesize in rx path") and 4ce62d5 ("net: usb: ax88179_178a: stop lying about skb->truesize") v3: also fix a sparse error ( https://lore.kernel.org/oe-kbuild-all/[email protected]/ ) v2: leave the skb_trim() game because smsc95xx_rx_csum_offload() needs the csum part. (Jakub) While we are it, use get_unaligned() in smsc95xx_rx_csum_offload(). Fixes: 2f7ca80 ("net: Add SMSC LAN9500 USB2.0 10/100 ethernet adapter driver") Signed-off-by: Eric Dumazet <[email protected]> Cc: Steve Glendinning <[email protected]> Cc: [email protected] Reviewed-by: Simon Horman <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 089507a commit d50729f

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

drivers/net/usb/smsc95xx.c

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1810,9 +1810,11 @@ static int smsc95xx_reset_resume(struct usb_interface *intf)
18101810

18111811
static void smsc95xx_rx_csum_offload(struct sk_buff *skb)
18121812
{
1813-
skb->csum = *(u16 *)(skb_tail_pointer(skb) - 2);
1813+
u16 *csum_ptr = (u16 *)(skb_tail_pointer(skb) - 2);
1814+
1815+
skb->csum = (__force __wsum)get_unaligned(csum_ptr);
18141816
skb->ip_summed = CHECKSUM_COMPLETE;
1815-
skb_trim(skb, skb->len - 2);
1817+
skb_trim(skb, skb->len - 2); /* remove csum */
18161818
}
18171819

18181820
static int smsc95xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
@@ -1870,25 +1872,22 @@ static int smsc95xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
18701872
if (dev->net->features & NETIF_F_RXCSUM)
18711873
smsc95xx_rx_csum_offload(skb);
18721874
skb_trim(skb, skb->len - 4); /* remove fcs */
1873-
skb->truesize = size + sizeof(struct sk_buff);
18741875

18751876
return 1;
18761877
}
18771878

1878-
ax_skb = skb_clone(skb, GFP_ATOMIC);
1879+
ax_skb = netdev_alloc_skb_ip_align(dev->net, size);
18791880
if (unlikely(!ax_skb)) {
18801881
netdev_warn(dev->net, "Error allocating skb\n");
18811882
return 0;
18821883
}
18831884

1884-
ax_skb->len = size;
1885-
ax_skb->data = packet;
1886-
skb_set_tail_pointer(ax_skb, size);
1885+
skb_put(ax_skb, size);
1886+
memcpy(ax_skb->data, packet, size);
18871887

18881888
if (dev->net->features & NETIF_F_RXCSUM)
18891889
smsc95xx_rx_csum_offload(ax_skb);
18901890
skb_trim(ax_skb, ax_skb->len - 4); /* remove fcs */
1891-
ax_skb->truesize = size + sizeof(struct sk_buff);
18921891

18931892
usbnet_skb_return(dev, ax_skb);
18941893
}

0 commit comments

Comments
 (0)