Commit a159d3c4 authored Nov 01, 2017 by Cong Wang Committed by David S. Miller Nov 03, 2017

net_sched: acquire RTNL in tc_action_net_exit()



I forgot to acquire RTNL in tc_action_net_exit()
which leads that action ops->cleanup() is not always
called with RTNL. This usually is not a big deal because
this function is called after all netns refcnt are gone,
but given RTNL protects more than just actions, add it
for safety and consistency.

Also add an assertion to catch other potential bugs.

Fixes: ddf97ccd ("net_sched: add network namespace support for tc actions")
Reported-by: Lucas Bates <lucasb@mojatatu.com>
Tested-by: 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>

parent 74784da8

include/net/act_api.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -122,7 +122,9 @@ void tcf_idrinfo_destroy(const struct tc_action_ops *ops,

		static inline void tc_action_net_exit(struct tc_action_net *tn)
		{
		rtnl_lock();
		tcf_idrinfo_destroy(tn->ops, tn->idrinfo);
		rtnl_unlock();
		kfree(tn->idrinfo);
		}

net/sched/act_api.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -86,6 +86,8 @@ int __tcf_idr_release(struct tc_action *p, bool bind, bool strict)
		{
		int ret = 0;

		ASSERT_RTNL();

		if (p) {
		if (bind)
		p->tcfa_bindcnt--;

Admin message