0717-v6.0-net-lantiq_xrx200-confirm-skb-is-allocated-before-us.patch 1.1 KB

123456789101112131415161718192021222324252627282930313233
  1. From c8b043702dc0894c07721c5b019096cebc8c798f Mon Sep 17 00:00:00 2001
  2. From: Aleksander Jan Bajkowski <[email protected]>
  3. Date: Wed, 24 Aug 2022 23:54:06 +0200
  4. Subject: [PATCH] net: lantiq_xrx200: confirm skb is allocated before using
  5. xrx200_hw_receive() assumes build_skb() always works and goes straight
  6. to skb_reserve(). However, build_skb() can fail under memory pressure.
  7. Add a check in case build_skb() failed to allocate and return NULL.
  8. Fixes: e015593573b3 ("net: lantiq_xrx200: convert to build_skb")
  9. Reported-by: Eric Dumazet <[email protected]>
  10. Signed-off-by: Aleksander Jan Bajkowski <[email protected]>
  11. Signed-off-by: Jakub Kicinski <[email protected]>
  12. ---
  13. drivers/net/ethernet/lantiq_xrx200.c | 6 ++++++
  14. 1 file changed, 6 insertions(+)
  15. --- a/drivers/net/ethernet/lantiq_xrx200.c
  16. +++ b/drivers/net/ethernet/lantiq_xrx200.c
  17. @@ -239,6 +239,12 @@ static int xrx200_hw_receive(struct xrx2
  18. }
  19. skb = build_skb(buf, priv->rx_skb_size);
  20. + if (!skb) {
  21. + skb_free_frag(buf);
  22. + net_dev->stats.rx_dropped++;
  23. + return -ENOMEM;
  24. + }
  25. +
  26. skb_reserve(skb, NET_SKB_PAD);
  27. skb_put(skb, len);