diff options
author | Sabrina Dubroca <sd@queasysnail.net> | 2015-03-10 16:03:54 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-03-11 16:46:26 -0400 |
commit | 6dede75b7e8ed4af31c3b06aec84401a5db88be9 (patch) | |
tree | 3aa394c164823beea07464d6d7181457d6d739f4 /net | |
parent | 8a08919f43d9955d5afc5d6b416964401e3c58d8 (diff) |
fib_trie: call fib_table_flush_external under RTNL
Move rtnl_lock() before the call to fib4_rules_exit so that
fib_table_flush_external is called under RTNL.
Fixes: 104616e74e0b ("switchdev: don't support custom ip rules, for now")
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Acked-by: Alexander Duyck <alexander.h.duyck@redhat.com>
Reviewed-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/fib_frontend.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c index 7cda3b0521d8..a0b69ae8be1c 100644 --- a/net/ipv4/fib_frontend.c +++ b/net/ipv4/fib_frontend.c | |||
@@ -1171,11 +1171,12 @@ static void ip_fib_net_exit(struct net *net) | |||
1171 | { | 1171 | { |
1172 | unsigned int i; | 1172 | unsigned int i; |
1173 | 1173 | ||
1174 | rtnl_lock(); | ||
1175 | |||
1174 | #ifdef CONFIG_IP_MULTIPLE_TABLES | 1176 | #ifdef CONFIG_IP_MULTIPLE_TABLES |
1175 | fib4_rules_exit(net); | 1177 | fib4_rules_exit(net); |
1176 | #endif | 1178 | #endif |
1177 | 1179 | ||
1178 | rtnl_lock(); | ||
1179 | for (i = 0; i < FIB_TABLE_HASHSZ; i++) { | 1180 | for (i = 0; i < FIB_TABLE_HASHSZ; i++) { |
1180 | struct hlist_head *head = &net->ipv4.fib_table_hash[i]; | 1181 | struct hlist_head *head = &net->ipv4.fib_table_hash[i]; |
1181 | struct hlist_node *tmp; | 1182 | struct hlist_node *tmp; |