diff options
| author | John Fastabend <john.fastabend@gmail.com> | 2016-01-10 21:38:44 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-01-31 11:29:00 -0800 |
| commit | 4d90b0d1c15cf9daa3089faf163df75a68bba5b7 (patch) | |
| tree | 6f612aacb047989e79a73e7a6c5de8f498136f7f /net/core/pktgen.c | |
| parent | 8ece807074d09df2dc2a2ba12783cc5a36cb6cf2 (diff) | |
| download | blackbird-op-linux-4d90b0d1c15cf9daa3089faf163df75a68bba5b7.tar.gz blackbird-op-linux-4d90b0d1c15cf9daa3089faf163df75a68bba5b7.zip | |
net: pktgen: fix null ptr deref in skb allocation
[ Upstream commit 3de03596dfeee48bc803c1d1a6daf60a459929f3 ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/core/pktgen.c')
| -rw-r--r-- | net/core/pktgen.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/core/pktgen.c b/net/core/pktgen.c index de8d5cc5eb24..4da4d51a2ccf 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -2787,7 +2787,9 @@ static struct sk_buff *pktgen_alloc_skb(struct net_device *dev, } else { 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; } |
