Skip to contentSkip to conversation

Patch "net: sched: fix missing free per cpu on qstats" has been added to the 4.3-stable tree

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

Subsystems (3)
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: sched: fix missing free per cpu on qstats

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-sched-fix-missing-free-per-cpu-on-qstats.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: Tue, 5 Jan 2016 09:11:36 -0800
Subject: net: sched: fix missing free per cpu on qstats

From: John Fastabend <[email protected]>

[ Upstream commit 73c20a8b7245273125cfe92c4b46e6fdb568a801 ]

When a qdisc is using per cpu stats (currently just the ingress qdisc) only the bstats are being freed. This also free's the qstats.

Fixes b0ab6f92752b9f9d8 ("net: sched: enable per cpu qstats")
---
 net/sched/sch_generic.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
net/sched/sch_generic.c +3 -1
@@ -658,8 +658,10 @@ static void qdisc_rcu_free(struct rcu_he
 {
 	struct Qdisc *qdisc = container_of(head, struct Qdisc, rcu_head);
 
-	if (qdisc_is_percpu_stats(qdisc))
+	if (qdisc_is_percpu_stats(qdisc)) {
 		free_percpu(qdisc->cpu_bstats);
+		free_percpu(qdisc->cpu_qstats);
+	}
 
 	kfree((char *) qdisc - qdisc->padded);
 }

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