diff options
author | Eric Dumazet <edumazet@google.com> | 2017-04-19 12:59:24 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-04-21 13:24:05 -0400 |
commit | d4ca73591916b760478d2b04334d5dcadc028e9c (patch) | |
tree | 57cd58dfbbf01ec294e910ae3f0ad9f76ebbbd0a | |
parent | d532c1082f68176363ed766d09bf187616e282fe (diff) |
lan78xx: use skb_cow_head() to deal with cloned skbs
We need to ensure there is enough headroom to push extra header,
but we also need to check if we are allowed to change headers.
skb_cow_head() is the proper helper to deal with this.
Fixes: 55d7de9de6c3 ("Microchip's LAN7800 family USB 2/3 to 10/100/1000 Ethernet device driver")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: James Hughes <james.hughes@raspberrypi.org>
Cc: Woojung Huh <woojung.huh@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/usb/lan78xx.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c index 9889a70ff4f6..636f48f19d1e 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c | |||
@@ -2607,14 +2607,9 @@ static struct sk_buff *lan78xx_tx_prep(struct lan78xx_net *dev, | |||
2607 | { | 2607 | { |
2608 | u32 tx_cmd_a, tx_cmd_b; | 2608 | u32 tx_cmd_a, tx_cmd_b; |
2609 | 2609 | ||
2610 | if (skb_headroom(skb) < TX_OVERHEAD) { | 2610 | if (skb_cow_head(skb, TX_OVERHEAD)) { |
2611 | struct sk_buff *skb2; | ||
2612 | |||
2613 | skb2 = skb_copy_expand(skb, TX_OVERHEAD, 0, flags); | ||
2614 | dev_kfree_skb_any(skb); | 2611 | dev_kfree_skb_any(skb); |
2615 | skb = skb2; | 2612 | return NULL; |
2616 | if (!skb) | ||
2617 | return NULL; | ||
2618 | } | 2613 | } |
2619 | 2614 | ||
2620 | if (lan78xx_linearize(skb) < 0) | 2615 | if (lan78xx_linearize(skb) < 0) |