diff options
| author | Evgeniy Polyakov <johnpol@2ka.mipt.ru> | 2007-11-13 09:27:27 +0100 |
|---|---|---|
| committer | Adrian Bunk <bunk@kernel.org> | 2007-11-13 09:27:27 +0100 |
| commit | 526d19a5e1cf1c252c9c6355c0ba8912fb9f02c5 (patch) | |
| tree | 44c4365caccf60c9914b7fff8e84b63bac8a29b4 | |
| parent | 9c78b87bdfc519a9b73300c288a70cd4ee9f79c3 (diff) | |
[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: Adrian Bunk <bunk@kernel.org>
| -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 79b8ef34c6e4..e7dc750ecade 100644 --- a/net/sched/sch_teql.c +++ b/net/sched/sch_teql.c @@ -265,6 +265,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) |