Skip to content

Commit 6c04d3f

Browse files
Eric Dumazethoang1007
Eric Dumazet
authored andcommitted
net: usb: smsc95xx: stop lying about skb->truesize
[ Upstream commit d50729f1d60bca822ef6d9c1a5fb28d486bd7593 ] 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 4ce62d5b2f7a ("net: usb: ax88179_178a: stop lying about skb->truesize") v3: also fix a sparse error ( https://lore.kernel.org/oe-kbuild-all/202405091310.KvncIecx-lkp@intel.com/ ) 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 <edumazet@google.com> Cc: Steve Glendinning <steve.glendinning@shawell.net> Cc: UNGLinuxDriver@microchip.com Reviewed-by: Simon Horman <horms@kernel.org> Link: https://lore.kernel.org/r/20240509083313.2113832-1-edumazet@google.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent b33ec18 commit 6c04d3f

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

drivers/net/usb/smsc95xx.c

+7-8
Original file line numberDiff line numberDiff line change
@@ -1924,9 +1924,11 @@ static int smsc95xx_reset_resume(struct usb_interface *intf)
19241924

19251925
static void smsc95xx_rx_csum_offload(struct sk_buff *skb)
19261926
{
1927-
skb->csum = *(u16 *)(skb_tail_pointer(skb) - 2);
1927+
u16 *csum_ptr = (u16 *)(skb_tail_pointer(skb) - 2);
1928+
1929+
skb->csum = (__force __wsum)get_unaligned(csum_ptr);
19281930
skb->ip_summed = CHECKSUM_COMPLETE;
1929-
skb_trim(skb, skb->len - 2);
1931+
skb_trim(skb, skb->len - 2); /* remove csum */
19301932
}
19311933

19321934
static int smsc95xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
@@ -1985,25 +1987,22 @@ static int smsc95xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
19851987
if (dev->net->features & NETIF_F_RXCSUM)
19861988
smsc95xx_rx_csum_offload(skb);
19871989
skb_trim(skb, skb->len - 4); /* remove fcs */
1988-
skb->truesize = size + sizeof(struct sk_buff);
19891990

19901991
return 1;
19911992
}
19921993

1993-
ax_skb = skb_clone(skb, GFP_ATOMIC);
1994+
ax_skb = netdev_alloc_skb_ip_align(dev->net, size);
19941995
if (unlikely(!ax_skb)) {
19951996
netdev_warn(dev->net, "Error allocating skb\n");
19961997
return 0;
19971998
}
19981999

1999-
ax_skb->len = size;
2000-
ax_skb->data = packet;
2001-
skb_set_tail_pointer(ax_skb, size);
2000+
skb_put(ax_skb, size);
2001+
memcpy(ax_skb->data, packet, size);
20022002

20032003
if (dev->net->features & NETIF_F_RXCSUM)
20042004
smsc95xx_rx_csum_offload(ax_skb);
20052005
skb_trim(ax_skb, ax_skb->len - 4); /* remove fcs */
2006-
ax_skb->truesize = size + sizeof(struct sk_buff);
20072006

20082007
usbnet_skb_return(dev, ax_skb);
20092008
}

0 commit comments

Comments
 (0)