diff options
| author | Jarek Poplawski <jarkao2@gmail.com> | 2008-08-13 15:16:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-13 15:16:43 -0700 |
| commit | 26b284de54a5ca3dfbe2fd9a51ac1923e80085a2 (patch) | |
| tree | 949d06bd4dca0b43cb7247c2013c89337a8ca18b /net/sched/sch_htb.c | |
| parent | 64c00d81b5c2491bd140b3c8eb2e8c351513f971 (diff) | |
| download | kernel_samsung_aries-26b284de54a5ca3dfbe2fd9a51ac1923e80085a2.zip kernel_samsung_aries-26b284de54a5ca3dfbe2fd9a51ac1923e80085a2.tar.gz kernel_samsung_aries-26b284de54a5ca3dfbe2fd9a51ac1923e80085a2.tar.bz2 | |
pkt_sched: Fix oops in htb_delete.
Recent changes introduced a bug in htb_delete(): cl->parent->children
counter update misses checking cl->parent for NULL, which is used for
root classes, so deleting them causes an oops.
Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_htb.c')
| -rw-r--r-- | net/sched/sch_htb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index be35422..6febd24 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c @@ -1279,7 +1279,8 @@ static int htb_delete(struct Qdisc *sch, unsigned long arg) /* delete from hash and active; remainder in destroy_class */ qdisc_class_hash_remove(&q->clhash, &cl->common); - cl->parent->children--; + if (cl->parent) + cl->parent->children--; if (cl->prio_activity) htb_deactivate(q, cl); |