Browse Source

ipv4: Do not allow MAIN to be alias for new LOCAL w/ custom rules

In the case of custom rules being present we need to handle the case of the
LOCAL table being intialized after the new rule has been added.  To address
that I am adding a new check so that we can make certain we don't use an
alias of MAIN for LOCAL when allocating a new table.

Fixes: 0ddcf43d5d4a ("ipv4: FIB Local/MAIN table collapse")
Reported-by: Oliver Brunel <jjk@jjacky.com>
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Alexander Duyck 8 years ago
parent
commit
5350d54f6c
1 changed files with 1 additions and 1 deletions
  1. 1 1
      net/ipv4/fib_frontend.c

+ 1 - 1
net/ipv4/fib_frontend.c

@@ -85,7 +85,7 @@ struct fib_table *fib_new_table(struct net *net, u32 id)
 	if (tb)
 	if (tb)
 		return tb;
 		return tb;
 
 
-	if (id == RT_TABLE_LOCAL)
+	if (id == RT_TABLE_LOCAL && !net->ipv4.fib_has_custom_rules)
 		alias = fib_new_table(net, RT_TABLE_MAIN);
 		alias = fib_new_table(net, RT_TABLE_MAIN);
 
 
 	tb = fib_trie_table(id, alias);
 	tb = fib_trie_table(id, alias);