diff options
| author | Gao Feng <gfree.wind@vip.163.com> | 2017-06-28 06:53:54 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-29 18:55:12 +0200 |
| commit | c1a4872ebfb83b1af7144f7b29ac8c4b344a12a8 (patch) | |
| tree | bfd7474b87652f2ddbe4f2d6583fe081ebdb0c35 /net | |
| parent | virtio-net: serialize tx routine during reset (diff) | |
| download | linux-c1a4872ebfb83b1af7144f7b29ac8c4b344a12a8.tar.xz linux-c1a4872ebfb83b1af7144f7b29ac8c4b344a12a8.zip | |
net: sched: Fix one possible panic when no destroy callback
When qdisc fail to init, qdisc_create would invoke the destroy callback
to cleanup. But there is no check if the callback exists really. So it
would cause the panic if there is no real destroy callback like the qdisc
codel, fq, and so on.
Take codel as an example following:
When a malicious user constructs one invalid netlink msg, it would cause
codel_init->codel_change->nla_parse_nested failed.
Then kernel would invoke the destroy callback directly but qdisc codel
doesn't define one. It causes one panic as a result.
Now add one the check for destroy to avoid the possible panic.
Fixes: 87b60cfacf9f ("net_sched: fix error recovery at qdisc creation")
Signed-off-by: Gao Feng <gfree.wind@vip.163.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sched/sch_api.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index e88342fde1bc..cfdbfa18a95e 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c @@ -1019,7 +1019,8 @@ static struct Qdisc *qdisc_create(struct net_device *dev, return sch; } /* ops->init() failed, we call ->destroy() like qdisc_create_dflt() */ - ops->destroy(sch); + if (ops->destroy) + ops->destroy(sch); err_out3: dev_put(dev); kfree((char *) sch - sch->padded); |