diff options
| author | Patrick McHardy <kaber@trash.net> | 2009-09-10 03:11:23 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-10 03:11:23 +0200 |
| commit | 23bcf634c8bc0d84607a5b863333191d58baee4c (patch) | |
| tree | bc988ab6230bebf47e1dc22db70f94901ac2eeb5 /net/sched/sch_mq.c | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| download | linux-23bcf634c8bc0d84607a5b863333191d58baee4c.tar.xz linux-23bcf634c8bc0d84607a5b863333191d58baee4c.zip | |
net_sched: fix estimator lock selection for mq child qdiscs
When new child qdiscs are attached to the mq qdisc, they are actually
attached as root qdiscs to the device queues. The lock selection for
new estimators incorrectly picks the root lock of the existing and
to be replaced qdisc, which results in a use-after-free once the old
qdisc has been destroyed.
Mark mq qdisc instances with a new flag and treat qdiscs attached to
mq as children similar to regular root qdiscs.
Additionally prevent estimators from being attached to the mq qdisc
itself since it only updates its byte and packet counters during dumps.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_mq.c')
| -rw-r--r-- | net/sched/sch_mq.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sched/sch_mq.c b/net/sched/sch_mq.c index c84dec9c8c7d..dd5ee022f1f7 100644 --- a/net/sched/sch_mq.c +++ b/net/sched/sch_mq.c @@ -64,6 +64,7 @@ static int mq_init(struct Qdisc *sch, struct nlattr *opt) priv->qdiscs[ntx] = qdisc; } + sch->flags |= TCQ_F_MQROOT; return 0; err: |