diff options
| author | Alexander Duyck <alexander.h.duyck@intel.com> | 2017-01-02 22:32:54 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-03 15:38:34 +0100 |
| commit | 5350d54f6cd12eaff623e890744c79b700bd3f17 (patch) | |
| tree | ce5b6842e8e35439b2a44b98df7b75aa8107417c /net/ipv4 | |
| parent | net: macb: Updated resource allocation function calls to new version of API. (diff) | |
| download | linux-5350d54f6cd12eaff623e890744c79b700bd3f17.tar.xz linux-5350d54f6cd12eaff623e890744c79b700bd3f17.zip | |
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>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/fib_frontend.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c index 3ff8938893ec..eae0332b0e8c 100644 --- a/net/ipv4/fib_frontend.c +++ b/net/ipv4/fib_frontend.c @@ -85,7 +85,7 @@ struct fib_table *fib_new_table(struct net *net, u32 id) if (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); tb = fib_trie_table(id, alias); |