030-4-sr9700-use-skb_cow_head-to-deal-with-cloned-skbs.patch 1.2 KB

12345678910111213141516171819202122232425262728293031323334353637
  1. From d532c1082f68176363ed766d09bf187616e282fe Mon Sep 17 00:00:00 2001
  2. From: Eric Dumazet <edumazet@google.com>
  3. Date: Wed, 19 Apr 2017 09:59:23 -0700
  4. Subject: [PATCH] sr9700: 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: c9b37458e956 ("USB2NET : SR9700 : One chip USB 1.1 USB2NET SR9700Device Driver Support")
  9. Signed-off-by: Eric Dumazet <edumazet@google.com>
  10. Cc: James Hughes <james.hughes@raspberrypi.org>
  11. Signed-off-by: David S. Miller <davem@davemloft.net>
  12. ---
  13. drivers/net/usb/sr9700.c | 9 ++-------
  14. 1 file changed, 2 insertions(+), 7 deletions(-)
  15. --- a/drivers/net/usb/sr9700.c
  16. +++ b/drivers/net/usb/sr9700.c
  17. @@ -456,14 +456,9 @@ static struct sk_buff *sr9700_tx_fixup(s
  18. len = skb->len;
  19. - if (skb_headroom(skb) < SR_TX_OVERHEAD) {
  20. - struct sk_buff *skb2;
  21. -
  22. - skb2 = skb_copy_expand(skb, SR_TX_OVERHEAD, 0, flags);
  23. + if (skb_cow_head(skb, SR_TX_OVERHEAD)) {
  24. dev_kfree_skb_any(skb);
  25. - skb = skb2;
  26. - if (!skb)
  27. - return NULL;
  28. + return NULL;
  29. }
  30. __skb_push(skb, SR_TX_OVERHEAD);