Skip to content

Commit 05417aa

Browse files
edumazetkuba-moo
authored andcommitted
net: usb: sr9700: stop lying about skb->truesize
Some usb drivers 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") Fixes: c9b3745 ("USB2NET : SR9700 : One chip USB 1.1 USB2NET SR9700Device Driver Support") Signed-off-by: Eric Dumazet <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 1b3b2d9 commit 05417aa

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

drivers/net/usb/sr9700.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -421,19 +421,15 @@ static int sr9700_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
421421
skb_pull(skb, 3);
422422
skb->len = len;
423423
skb_set_tail_pointer(skb, len);
424-
skb->truesize = len + sizeof(struct sk_buff);
425424
return 2;
426425
}
427426

428-
/* skb_clone is used for address align */
429-
sr_skb = skb_clone(skb, GFP_ATOMIC);
427+
sr_skb = netdev_alloc_skb_ip_align(dev->net, len);
430428
if (!sr_skb)
431429
return 0;
432430

433-
sr_skb->len = len;
434-
sr_skb->data = skb->data + 3;
435-
skb_set_tail_pointer(sr_skb, len);
436-
sr_skb->truesize = len + sizeof(struct sk_buff);
431+
skb_put(sr_skb, len);
432+
memcpy(sr_skb->data, skb->data + 3, len);
437433
usbnet_skb_return(dev, sr_skb);
438434

439435
skb_pull(skb, len + SR_RX_OVERHEAD);

0 commit comments

Comments
 (0)