Commit f8e3d1b1 authored by James Hughes's avatar James Hughes Committed by Greg Kroah-Hartman

smsc95xx: Use skb_cow_head to deal with cloned skbs

commit e9156cd2 upstream.

The driver was failing to check that the SKB wasn't cloned
before adding checksum data.
Replace existing handling to extend/copy the header buffer
with skb_cow_head.
Signed-off-by: default avatarJames Hughes <james.hughes@raspberrypi.org>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Acked-by: default avatarWoojung Huh <Woojung.Huh@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 27a70770
...@@ -1838,13 +1838,13 @@ static struct sk_buff *smsc95xx_tx_fixup(struct usbnet *dev, ...@@ -1838,13 +1838,13 @@ static struct sk_buff *smsc95xx_tx_fixup(struct usbnet *dev,
/* We do not advertise SG, so skbs should be already linearized */ /* We do not advertise SG, so skbs should be already linearized */
BUG_ON(skb_shinfo(skb)->nr_frags); BUG_ON(skb_shinfo(skb)->nr_frags);
if (skb_headroom(skb) < overhead) { /* Make writable and expand header space by overhead if required */
struct sk_buff *skb2 = skb_copy_expand(skb, if (skb_cow_head(skb, overhead)) {
overhead, 0, flags); /* Must deallocate here as returning NULL to indicate error
* means the skb won't be deallocated in the caller.
*/
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
skb = skb2; return NULL;
if (!skb)
return NULL;
} }
if (csum) { if (csum) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment