diff options
| author | Alexander Duyck <aduyck@mirantis.com> | 2015-10-27 15:06:45 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-27 18:14:51 -0700 |
| commit | c2229fe1430d4e1c70e36520229dd64a87802b20 (patch) | |
| tree | 9d2f2cb4fd5a6af71b95b873d84cfdce13365ea5 /net/ipv4 | |
| parent | 8fe012964a39ead19405ba8d65f50d4fd598f5b8 (diff) | |
| download | blackbird-op-linux-c2229fe1430d4e1c70e36520229dd64a87802b20.tar.gz blackbird-op-linux-c2229fe1430d4e1c70e36520229dd64a87802b20.zip | |
fib_trie: leaf_walk_rcu should not compute key if key is less than pn->key
We were computing the child index in cases where the key value we were
looking for was actually less than the base key of the tnode. As a result
we were getting incorrect index values that would cause us to skip over
some children.
To fix this I have added a test that will force us to use child index 0 if
the key we are looking for is less than the key of the current tnode.
Fixes: 8be33e955cb9 ("fib_trie: Fib walk rcu should take a tnode and key instead of a trie and a leaf")
Reported-by: Brian Rak <brak@gameservers.com>
Signed-off-by: Alexander Duyck <aduyck@mirantis.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/fib_trie.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index 6c2af797f2f9..744e5936c10d 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c @@ -1569,7 +1569,7 @@ static struct key_vector *leaf_walk_rcu(struct key_vector **tn, t_key key) do { /* record parent and next child index */ pn = n; - cindex = key ? get_index(key, pn) : 0; + cindex = (key > pn->key) ? get_index(key, pn) : 0; if (cindex >> pn->bits) break; |
