Jelajahi Sumber

net: pktgen: fix null ptr deref in skb allocation

Fix possible null pointer dereference that may occur when calling
skb_reserve() on a null skb.

Fixes: 879c7220e82 ("net: pktgen: Observe needed_headroom of the device")
Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
John Fastabend 9 tahun lalu
induk
melakukan
3de03596df
1 mengubah file dengan 3 tambahan dan 1 penghapusan
  1. 3 1
      net/core/pktgen.c

+ 3 - 1
net/core/pktgen.c

@@ -2787,7 +2787,9 @@ static struct sk_buff *pktgen_alloc_skb(struct net_device *dev,
 	} else {
 	} else {
 		 skb = __netdev_alloc_skb(dev, size, GFP_NOWAIT);
 		 skb = __netdev_alloc_skb(dev, size, GFP_NOWAIT);
 	}
 	}
-	skb_reserve(skb, LL_RESERVED_SPACE(dev));
+
+	if (likely(skb))
+		skb_reserve(skb, LL_RESERVED_SPACE(dev));
 
 
 	return skb;
 	return skb;
 }
 }