Skip to content

Commit

Permalink
cls_tcindex: use tcf_exts_get_net() before call_rcu()
Browse files Browse the repository at this point in the history
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 <[email protected]>
Cc: Jamal Hadi Salim <[email protected]>
Cc: Jiri Pirko <[email protected]>
Signed-off-by: Cong Wang <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
congwang authored and davem330 committed Nov 9, 2017
1 parent 9658506 commit f2b7510
Showing 1 changed file with 26 additions and 7 deletions.
33 changes: 26 additions & 7 deletions net/sched/cls_tcindex.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand All @@ -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();
}

Expand Down Expand Up @@ -210,10 +222,17 @@ static int tcindex_delete(struct tcf_proto *tp, void *arg, bool *last)
* 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;
Expand Down

0 comments on commit f2b7510

Please sign in to comment.