| From 93ed2b025ba5049e39d0aa3f7d2453418c85b9e9 Mon Sep 17 00:00:00 2001 |
| From: Jarek Poplawski <jarkao2@gmail.com> |
| Date: Sun, 19 Oct 2008 23:37:47 -0700 |
| Subject: pkt_sched: sch_generic: Fix oops in sch_teql |
| |
| From: Jarek Poplawski <jarkao2@gmail.com> |
| |
| [ Upstream commit 9f3ffae0dbce491a3e9871b686342fd5aa854f05 ] |
| |
| 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> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| net/sched/sch_generic.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- a/net/sched/sch_generic.c |
| +++ b/net/sched/sch_generic.c |
| @@ -319,6 +319,7 @@ struct Qdisc_ops noop_qdisc_ops __read_m |
| |
| static struct netdev_queue noop_netdev_queue = { |
| .qdisc = &noop_qdisc, |
| + .qdisc_sleeping = &noop_qdisc, |
| }; |
| |
| struct Qdisc noop_qdisc = { |
| @@ -344,6 +345,7 @@ static struct Qdisc_ops noqueue_qdisc_op |
| static struct Qdisc noqueue_qdisc; |
| static struct netdev_queue noqueue_netdev_queue = { |
| .qdisc = &noqueue_qdisc, |
| + .qdisc_sleeping = &noqueue_qdisc, |
| }; |
| |
| static struct Qdisc noqueue_qdisc = { |
