Commit 92f91706 authored by WANG Cong's avatar WANG Cong Committed by David S. Miller

net_sched: check noop_qdisc before qdisc_hash_add()

Dmitry reported a crash when injecting faults in
attach_one_default_qdisc() and dev->qdisc is still
a noop_disc, the check before qdisc_hash_add() fails
to catch it because it tests NULL. We should test
against noop_qdisc since it is the default qdisc
at this point.

Fixes: 59cc1f61 ("net: sched: convert qdisc linked list to hashtable")
Reported-by: default avatarDmitry Vyukov <dvyukov@google.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Acked-by: default avatarJiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a8801799
...@@ -794,7 +794,7 @@ static void attach_default_qdiscs(struct net_device *dev) ...@@ -794,7 +794,7 @@ static void attach_default_qdiscs(struct net_device *dev)
} }
} }
#ifdef CONFIG_NET_SCHED #ifdef CONFIG_NET_SCHED
if (dev->qdisc) if (dev->qdisc != &noop_qdisc)
qdisc_hash_add(dev->qdisc); qdisc_hash_add(dev->qdisc);
#endif #endif
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment