030-5-lan78xx-use-skb_cow_head-to-deal-with-cloned-skbs.patch 1.2 KB

1234567891011121314151617181920212223242526272829303132333435363738
  1. From d4ca73591916b760478d2b04334d5dcadc028e9c Mon Sep 17 00:00:00 2001
  2. From: Eric Dumazet <edumazet@google.com>
  3. Date: Wed, 19 Apr 2017 09:59:24 -0700
  4. Subject: [PATCH] lan78xx: use skb_cow_head() to deal with cloned skbs
  5. We need to ensure there is enough headroom to push extra header,
  6. but we also need to check if we are allowed to change headers.
  7. skb_cow_head() is the proper helper to deal with this.
  8. Fixes: 55d7de9de6c3 ("Microchip's LAN7800 family USB 2/3 to 10/100/1000 Ethernet device driver")
  9. Signed-off-by: Eric Dumazet <edumazet@google.com>
  10. Cc: James Hughes <james.hughes@raspberrypi.org>
  11. Cc: Woojung Huh <woojung.huh@microchip.com>
  12. Signed-off-by: David S. Miller <davem@davemloft.net>
  13. ---
  14. drivers/net/usb/lan78xx.c | 9 ++-------
  15. 1 file changed, 2 insertions(+), 7 deletions(-)
  16. --- a/drivers/net/usb/lan78xx.c
  17. +++ b/drivers/net/usb/lan78xx.c
  18. @@ -2050,14 +2050,9 @@ static struct sk_buff *lan78xx_tx_prep(s
  19. {
  20. u32 tx_cmd_a, tx_cmd_b;
  21. - if (skb_headroom(skb) < TX_OVERHEAD) {
  22. - struct sk_buff *skb2;
  23. -
  24. - skb2 = skb_copy_expand(skb, TX_OVERHEAD, 0, flags);
  25. + if (skb_cow_head(skb, TX_OVERHEAD)) {
  26. dev_kfree_skb_any(skb);
  27. - skb = skb2;
  28. - if (!skb)
  29. - return NULL;
  30. + return NULL;
  31. }
  32. if (lan78xx_linearize(skb) < 0)