diff options
| author | Patrick McHardy <kaber@trash.net> | 2007-03-27 23:04:24 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-03-27 23:04:24 +0200 |
| commit | c38c83cb705a41e30a99545ae2314c00e3b9bf1c (patch) | |
| tree | 1d91f9303661f75c2104dd6db1d78f55445fc22c /net/sched/sch_hfsc.c | |
| parent | [NET]: Remove dead net/sched/Makefile entry for sch_hpfq.o. (diff) | |
| download | linux-c38c83cb705a41e30a99545ae2314c00e3b9bf1c.tar.xz linux-c38c83cb705a41e30a99545ae2314c00e3b9bf1c.zip | |
[NET_SCHED]: sch_htb/sch_hfsc: fix oops in qlen_notify
During both HTB and HFSC class deletion the class is removed from the
class hash before calling qdisc_tree_decrease_qlen. This makes the
->get operation in qdisc_tree_decrease_qlen fail, so it passes a NULL
pointer to ->qlen_notify, causing an oops.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_hfsc.c')
| -rw-r--r-- | net/sched/sch_hfsc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c index 396deb71480f..407c6fb1ba14 100644 --- a/net/sched/sch_hfsc.c +++ b/net/sched/sch_hfsc.c @@ -1184,10 +1184,12 @@ hfsc_delete_class(struct Qdisc *sch, unsigned long arg) sch_tree_lock(sch); - list_del(&cl->hlist); list_del(&cl->siblings); hfsc_adjust_levels(cl->cl_parent); + hfsc_purge_queue(sch, cl); + list_del(&cl->hlist); + if (--cl->refcnt == 0) hfsc_destroy_class(sch, cl); |