Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85f70f8a authored by Eric Dumazet's avatar Eric Dumazet Committed by Greg Kroah-Hartman
Browse files

net: usb: sr9700: stop lying about skb->truesize 



[ Upstream commit 05417aa9c0c038da2464a0c504b9d4f99814a23b ]

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 1e2c6117 ("net: cdc_ncm: reduce skb truesize
in rx path") and 4ce62d5b2f7a ("net: usb: ax88179_178a:
stop lying about skb->truesize")

Fixes: c9b37458 ("USB2NET : SR9700 : One chip USB 1.1 USB2NET SR9700Device Driver Support")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/20240506143939.3673865-1-edumazet@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 43b78d06

drivers/net/usb/sr9700.c

+3 −7
Original line number Original line Diff line number Diff line
@@ -418,19 +418,15 @@ static int sr9700_rx_fixup(struct usbnet *dev, struct sk_buff *skb) 
			skb_pull(skb, 3);

			skb_pull(skb, 3);

			skb->len = len;

			skb->len = len;

			skb_set_tail_pointer(skb, len);

			skb_set_tail_pointer(skb, len);

			skb->truesize = len + sizeof(struct sk_buff);

			return 2;

			return 2;

		}

		}





		/* skb_clone is used for address align */

		sr_skb = netdev_alloc_skb_ip_align(dev->net, len);

		sr_skb = skb_clone(skb, GFP_ATOMIC);

		if (!sr_skb)

		if (!sr_skb)

			return 0;

			return 0;





		sr_skb->len = len;

		skb_put(sr_skb, len);

		sr_skb->data = skb->data + 3;

		memcpy(sr_skb->data, skb->data + 3, len);

		skb_set_tail_pointer(sr_skb, len);

		sr_skb->truesize = len + sizeof(struct sk_buff);

		usbnet_skb_return(dev, sr_skb);

		usbnet_skb_return(dev, sr_skb);





		skb_pull(skb, len + SR_RX_OVERHEAD);

		skb_pull(skb, len + SR_RX_OVERHEAD);