Skip to contentSkip to conversation

Patch "net: pktgen: fix null ptr deref in skb allocation" has been added to the 4.3-stable tree

PATCH [email protected] 1 participant 1 message Jan 27, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

net: pktgen: fix null ptr deref in skb allocation

to the 4.3-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
net-pktgen-fix-null-ptr-deref-in-skb-allocation.patch
and it can be found in the queue-4.3 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Tue Jan 26 21:35:03 PST 2016

From: John Fastabend <[email protected]>
Date: Sun, 10 Jan 2016 21:38:44 -0800
Subject: net: pktgen: fix null ptr deref in skb allocation

From: John Fastabend <[email protected]>

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

Patches currently in stable-queue which might be from [email protected] are

queue-4.3/net-sched-fix-missing-free-per-cpu-on-qstats.patch queue-4.3/net-pktgen-fix-null-ptr-deref-in-skb-allocation.patch