cls_tcindex: use tcf_exts_get_net() before call_rcu()
Hold netns refcnt before call_rcu() and release it after the tcf_exts_destroy() is done. Note, on ->destroy() path we have to respect the return value of tcf_exts_get_net(), on other paths it should always return true, so we don't need to care. Cc: Lucas Bates <lucasb@mojatatu.com> Cc: Jamal Hadi Salim <jhs@mojatatu.com> Cc: Jiri Pirko <jiri@resnulli.us> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
96585063a2
Коммит
f2b751053e
|
@ -139,13 +139,19 @@ static int tcindex_init(struct tcf_proto *tp)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void __tcindex_destroy_rexts(struct tcindex_filter_result *r)
|
||||
{
|
||||
tcf_exts_destroy(&r->exts);
|
||||
tcf_exts_put_net(&r->exts);
|
||||
}
|
||||
|
||||
static void tcindex_destroy_rexts_work(struct work_struct *work)
|
||||
{
|
||||
struct tcindex_filter_result *r;
|
||||
|
||||
r = container_of(work, struct tcindex_filter_result, work);
|
||||
rtnl_lock();
|
||||
tcf_exts_destroy(&r->exts);
|
||||
__tcindex_destroy_rexts(r);
|
||||
rtnl_unlock();
|
||||
}
|
||||
|
||||
|
@ -158,14 +164,20 @@ static void tcindex_destroy_rexts(struct rcu_head *head)
|
|||
tcf_queue_work(&r->work);
|
||||
}
|
||||
|
||||
static void __tcindex_destroy_fexts(struct tcindex_filter *f)
|
||||
{
|
||||
tcf_exts_destroy(&f->result.exts);
|
||||
tcf_exts_put_net(&f->result.exts);
|
||||
kfree(f);
|
||||
}
|
||||
|
||||
static void tcindex_destroy_fexts_work(struct work_struct *work)
|
||||
{
|
||||
struct tcindex_filter *f = container_of(work, struct tcindex_filter,
|
||||
work);
|
||||
|
||||
rtnl_lock();
|
||||
tcf_exts_destroy(&f->result.exts);
|
||||
kfree(f);
|
||||
__tcindex_destroy_fexts(f);
|
||||
rtnl_unlock();
|
||||
}
|
||||
|
||||
|
@ -210,10 +222,17 @@ found:
|
|||
* grace period, since converted-to-rcu actions are relying on that
|
||||
* in cleanup() callback
|
||||
*/
|
||||
if (f)
|
||||
call_rcu(&f->rcu, tcindex_destroy_fexts);
|
||||
else
|
||||
call_rcu(&r->rcu, tcindex_destroy_rexts);
|
||||
if (f) {
|
||||
if (tcf_exts_get_net(&f->result.exts))
|
||||
call_rcu(&f->rcu, tcindex_destroy_fexts);
|
||||
else
|
||||
__tcindex_destroy_fexts(f);
|
||||
} else {
|
||||
if (tcf_exts_get_net(&r->exts))
|
||||
call_rcu(&r->rcu, tcindex_destroy_rexts);
|
||||
else
|
||||
__tcindex_destroy_rexts(r);
|
||||
}
|
||||
|
||||
*last = false;
|
||||
return 0;
|
||||
|
|
Загрузка…
Ссылка в новой задаче