Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96585063 authored by Cong Wang's avatar Cong Wang Committed by David S. Miller
Browse files

cls_rsvp: 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: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3fd51de5

net/sched/cls_rsvp.h

+12 −3
Original line number Diff line number Diff line
@@ -285,13 +285,19 @@ static int rsvp_init(struct tcf_proto *tp) 
	return -ENOBUFS;

}



static void __rsvp_delete_filter(struct rsvp_filter *f)

{

	tcf_exts_destroy(&f->exts);

	tcf_exts_put_net(&f->exts);

	kfree(f);

}



static void rsvp_delete_filter_work(struct work_struct *work)

{

	struct rsvp_filter *f = container_of(work, struct rsvp_filter, work);



	rtnl_lock();

	tcf_exts_destroy(&f->exts);

	kfree(f);

	__rsvp_delete_filter(f);

	rtnl_unlock();

}
@@ -310,7 +316,10 @@ static void rsvp_delete_filter(struct tcf_proto *tp, struct rsvp_filter *f) 
	 * grace period, since converted-to-rcu actions are relying on that

	 * in cleanup() callback

	 */

	if (tcf_exts_get_net(&f->exts))

		call_rcu(&f->rcu, rsvp_delete_filter_rcu);

	else

		__rsvp_delete_filter(f);

}



static void rsvp_destroy(struct tcf_proto *tp)