diff options
| author | Cong Wang <[email protected]> | 2018-09-27 20:42:19 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2018-10-02 06:09:41 +0000 |
| commit | 460b360104d51552a57f39e54b2589c9fd7fa0b3 (patch) | |
| tree | 84082e01896498cde177e058e72e6509786055bf /net/sched/cls_api.c | |
| parent | Merge branch 'netlink-extended-attribute-validation' (diff) | |
| download | kernel-460b360104d51552a57f39e54b2589c9fd7fa0b3.tar.gz kernel-460b360104d51552a57f39e54b2589c9fd7fa0b3.zip | |
net_sched: fix a crash in tc_new_tfilter()
When tcf_block_find() fails, it already rollbacks the qdisc refcnt,
so its caller doesn't need to clean up this again. Avoid calling
qdisc_put() again by resetting qdisc to NULL for callers.
Reported-by: [email protected]
Fixes: e368fdb61d8e ("net: sched: use Qdisc rcu API instead of relying on rtnl lock")
Signed-off-by: Cong Wang <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'net/sched/cls_api.c')
| -rw-r--r-- | net/sched/cls_api.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index 3de47e99b788..d670d3066ebd 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c @@ -717,8 +717,10 @@ static struct tcf_block *tcf_block_find(struct net *net, struct Qdisc **q, errout_rcu: rcu_read_unlock(); errout_qdisc: - if (*q) + if (*q) { qdisc_put(*q); + *q = NULL; + } return ERR_PTR(err); } |