From 4f9f8311a08c0d95c70261264a2b47f2ae99683a Mon Sep 17 00:00:00 2001
From: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Date: Tue, 6 Nov 2007 03:08:09 -0800
Subject: [PKT_SCHED]: Fix OOPS when removing devices from a teql queuing
discipline
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>
---
net/sched/sch_teql.c | 3 +++
1 file changed, 3 insertions(+)
(limited to 'net')
diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c
index 421281d9dd..c0ed06d4a5 100644
--- a/net/sched/sch_teql.c
+++ b/net/sched/sch_teql.c
@@ -252,6 +252,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->header_ops == NULL ||
skb->dst == NULL ||
skb->dst->neighbour == NULL)
--
cgit v1.2.2