Patchwork pkt_sched: sch_generic: Fix oops in sch_teql

login
register
mail settings
Submitter Jarek Poplawski
Date Oct. 18, 2008, 11:09 p.m.
Message ID <20081018230938.GC6048@ami.dom.local>
Download mbox | patch
Permalink /patch/5023/
State Accepted
Delegated to: David Miller
Headers show

Comments

Jarek Poplawski - Oct. 18, 2008, 11:09 p.m.
pkt_sched: sch_generic: Fix oops in sch_teql

After these commands:
# modprobe sch_teql
# tc qdisc add dev eth0 root teql0
# tc qdisc del dev eth0 root
we get an oops in teql_destroy() when spin_lock is taken from a null
qdisc_sleeping pointer. It's because at the moment teql0 dev haven't
been activated yet, and a qdisc_root_sleeping() is pointing to noop
qdisc's netdev_queue with qdisc_sleeping uninitialized. This patch
fixes this both for noop and noqueue netdev_queues to avoid similar
problems in the future.

Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
[regression in 2.6.27]
---

 net/sched/sch_generic.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Oct. 20, 2008, 6:38 a.m.
From: Jarek Poplawski <jarkao2@gmail.com>
Date: Sun, 19 Oct 2008 01:09:38 +0200

> pkt_sched: sch_generic: Fix oops in sch_teql
> 
> After these commands:
> # modprobe sch_teql
> # tc qdisc add dev eth0 root teql0
> # tc qdisc del dev eth0 root
> we get an oops in teql_destroy() when spin_lock is taken from a null
> qdisc_sleeping pointer. It's because at the moment teql0 dev haven't
> been activated yet, and a qdisc_root_sleeping() is pointing to noop
> qdisc's netdev_queue with qdisc_sleeping uninitialized. This patch
> fixes this both for noop and noqueue netdev_queues to avoid similar
> problems in the future.
> 
> Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
> [regression in 2.6.27]

Applied and will queue to -stable, thanks Jarek.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 7b5572d..93cd30c 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -326,6 +326,7 @@  struct Qdisc_ops noop_qdisc_ops __read_mostly = {
 
 static struct netdev_queue noop_netdev_queue = {
 	.qdisc		=	&noop_qdisc,
+	.qdisc_sleeping	=	&noop_qdisc,
 };
 
 struct Qdisc noop_qdisc = {
@@ -352,6 +353,7 @@  static struct Qdisc_ops noqueue_qdisc_ops __read_mostly = {
 static struct Qdisc noqueue_qdisc;
 static struct netdev_queue noqueue_netdev_queue = {
 	.qdisc		=	&noqueue_qdisc,
+	.qdisc_sleeping	=	&noqueue_qdisc,
 };
 
 static struct Qdisc noqueue_qdisc = {