Groups > linux.kernel > #1319287

[PATCH 4.3 102/157] net: pktgen: fix null ptr deref in skb allocation

From	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Newsgroups	linux.kernel
Subject	[PATCH 4.3 102/157] net: pktgen: fix null ptr deref in skb allocation
Date	2016-01-27 19:40 +0100
Message-ID	<qVDaz-7NJ-39@gated-at.bofh.it> (permalink)
References	<qVCRc-7CM-17@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

4.3-stable review patch.  If anyone has any objections, please let me know.

------------------

From: John Fastabend <john.fastabend@gmail.com>

[ 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>
---
 net/core/pktgen.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -2787,7 +2787,9 @@ static struct sk_buff *pktgen_alloc_skb(
 	} 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;
 }

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 4.3 102/157] net: pktgen: fix null ptr deref in skb allocation Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-01-27 19:40 +0100

csiph-web