diff options
| author | Jiri Pirko <jiri@mellanox.com> | 2017-05-20 15:01:32 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-05-23 11:00:07 -0400 |
| commit | f93e1cdcf42c1218e2a73be477d8ac21135e7f56 (patch) | |
| tree | 5ad589f300e3c2e2f7d053b0d15f5c1ee4157178 /net/sched | |
| parent | 31efcc250a1dea96edca6595a9639d898cf99ae5 (diff) | |
| download | linux-f93e1cdcf42c1218e2a73be477d8ac21135e7f56.tar.gz linux-f93e1cdcf42c1218e2a73be477d8ac21135e7f56.tar.bz2 linux-f93e1cdcf42c1218e2a73be477d8ac21135e7f56.zip | |
net/sched: fix filter flushing
When user instructs to remove all filters from chain, we cannot destroy
the chain as other actions may hold a reference. Also the put in errout
would try to destroy it again. So instead, just walk the chain and remove
all existing filters.
Fixes: 5bc1701881e3 ("net: sched: introduce multichain support for filters")
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Acked-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/cls_api.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index 85088ed07f6a..01a8b8b4bab8 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c @@ -201,15 +201,22 @@ static struct tcf_chain *tcf_chain_create(struct tcf_block *block, return chain; } -static void tcf_chain_destroy(struct tcf_chain *chain) +static void tcf_chain_flush(struct tcf_chain *chain) { struct tcf_proto *tp; - list_del(&chain->list); + if (*chain->p_filter_chain) + RCU_INIT_POINTER(*chain->p_filter_chain, NULL); while ((tp = rtnl_dereference(chain->filter_chain)) != NULL) { RCU_INIT_POINTER(chain->filter_chain, tp->next); tcf_proto_destroy(tp); } +} + +static void tcf_chain_destroy(struct tcf_chain *chain) +{ + list_del(&chain->list); + tcf_chain_flush(chain); kfree(chain); } @@ -510,7 +517,7 @@ replay: if (n->nlmsg_type == RTM_DELTFILTER && prio == 0) { tfilter_notify_chain(net, skb, n, chain, RTM_DELTFILTER); - tcf_chain_destroy(chain); + tcf_chain_flush(chain); err = 0; goto errout; } |