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

Commit 01c60b3f authored by Eric Dumazet's avatar Eric Dumazet Committed by Greg Kroah-Hartman
Browse files

ipv4: convert fib_num_tclassid_users to atomic_t 



commit 213f5f8f31f10aa1e83187ae20fb7fa4e626b724 upstream.

Before commit faa041a4 ("ipv4: Create cleanup helper for fib_nh")
changes to net->ipv4.fib_num_tclassid_users were protected by RTNL.

After the change, this is no longer the case, as free_fib_info_rcu()
runs after rcu grace period, without rtnl being held.

Fixes: faa041a4 ("ipv4: Create cleanup helper for fib_nh")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: David Ahern <dsahern@kernel.org>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent efb07398

include/net/ip_fib.h

+1 −1
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ int fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst, 
#ifdef CONFIG_IP_ROUTE_CLASSID

static inline int fib_num_tclassid_users(struct net *net)

{

	return net->ipv4.fib_num_tclassid_users;

	return atomic_read(&net->ipv4.fib_num_tclassid_users);

}

#else

static inline int fib_num_tclassid_users(struct net *net)

include/net/netns/ipv4.h

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ struct netns_ipv4 { 
#endif

	bool			fib_has_custom_local_routes;

#ifdef CONFIG_IP_ROUTE_CLASSID

	int			fib_num_tclassid_users;

	atomic_t		fib_num_tclassid_users;

#endif

	struct hlist_head	*fib_table_hash;

	bool			fib_offload_disabled;

net/ipv4/fib_frontend.c

+1 −1
Original line number Diff line number Diff line
@@ -1588,7 +1588,7 @@ static int __net_init fib_net_init(struct net *net) 
	int error;



#ifdef CONFIG_IP_ROUTE_CLASSID

	net->ipv4.fib_num_tclassid_users = 0;

	atomic_set(&net->ipv4.fib_num_tclassid_users, 0);

#endif

	error = ip_fib_net_init(net);

	if (error < 0)

net/ipv4/fib_rules.c

+2 −2
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ static int fib4_rule_configure(struct fib_rule *rule, struct sk_buff *skb, 
	if (tb[FRA_FLOW]) {

		rule4->tclassid = nla_get_u32(tb[FRA_FLOW]);

		if (rule4->tclassid)

			net->ipv4.fib_num_tclassid_users++;

			atomic_inc(&net->ipv4.fib_num_tclassid_users);

	}

#endif
@@ -290,7 +290,7 @@ static int fib4_rule_delete(struct fib_rule *rule) 


#ifdef CONFIG_IP_ROUTE_CLASSID

	if (((struct fib4_rule *)rule)->tclassid)

		net->ipv4.fib_num_tclassid_users--;

		atomic_dec(&net->ipv4.fib_num_tclassid_users);

#endif

	net->ipv4.fib_has_custom_rules = true;

net/ipv4/fib_semantics.c

+2 −2
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ void fib_nh_release(struct net *net, struct fib_nh *fib_nh) 
{

#ifdef CONFIG_IP_ROUTE_CLASSID

	if (fib_nh->nh_tclassid)

		net->ipv4.fib_num_tclassid_users--;

		atomic_dec(&net->ipv4.fib_num_tclassid_users);

#endif

	fib_nh_common_release(&fib_nh->nh_common);

}
@@ -624,7 +624,7 @@ int fib_nh_init(struct net *net, struct fib_nh *nh, 
#ifdef CONFIG_IP_ROUTE_CLASSID

	nh->nh_tclassid = cfg->fc_flow;

	if (nh->nh_tclassid)

		net->ipv4.fib_num_tclassid_users++;

		atomic_inc(&net->ipv4.fib_num_tclassid_users);

#endif

#ifdef CONFIG_IP_ROUTE_MULTIPATH

	nh->fib_nh_weight = nh_weight;