Commit c2229fe1 authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller

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: 8be33e95 ("fib_trie: Fib walk rcu should take a tnode and key instead of a trie and a leaf")
Reported-by: default avatarBrian Rak <brak@gameservers.com>
Signed-off-by: default avatarAlexander Duyck <aduyck@mirantis.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8fe01296
...@@ -1569,7 +1569,7 @@ static struct key_vector *leaf_walk_rcu(struct key_vector **tn, t_key key) ...@@ -1569,7 +1569,7 @@ static struct key_vector *leaf_walk_rcu(struct key_vector **tn, t_key key)
do { do {
/* record parent and next child index */ /* record parent and next child index */
pn = n; pn = n;
cindex = key ? get_index(key, pn) : 0; cindex = (key > pn->key) ? get_index(key, pn) : 0;
if (cindex >> pn->bits) if (cindex >> pn->bits)
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment