diff options
| author | Evgeniy Polyakov <johnpol@2ka.mipt.ru> | 2007-11-13 00:07:45 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-11-16 08:27:37 -0800 |
| commit | 61254a93643f43956a4b16c935ca5e058ef761b0 (patch) | |
| tree | a62a625459c66309dce997b217fa4f5bca299557 | |
| parent | c669e2ad32c2ab2bf4133ce8f7b96775b9c3db2b (diff) | |
| download | lwn-61254a93643f43956a4b16c935ca5e058ef761b0.tar.gz lwn-61254a93643f43956a4b16c935ca5e058ef761b0.zip | |
Fix TEQL oops.
[PKT_SCHED]: Fix OOPS when removing devices from a teql queuing discipline
[ Upstream commit: 4f9f8311a08c0d95c70261264a2b47f2ae99683a ]
tecl_reset() is called from deactivate and qdisc is set to noop already,
but subsequent teql_xmit does not know about it and dereference private
data as teql qdisc and thus oopses.
not catch it first :)
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | net/sched/sch_teql.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c index 0968184ea6be..cb5754ba5ba4 100644 --- a/net/sched/sch_teql.c +++ b/net/sched/sch_teql.c @@ -249,6 +249,9 @@ __teql_resolve(struct sk_buff *skb, struct sk_buff *skb_res, struct net_device * static __inline__ int teql_resolve(struct sk_buff *skb, struct sk_buff *skb_res, struct net_device *dev) { + if (dev->qdisc == &noop_qdisc) + return -ENODEV; + if (dev->hard_header == NULL || skb->dst == NULL || skb->dst->neighbour == NULL) |