Skip to content

Commit c2229fe

Browse files
Alexander Duyckdavem330
authored andcommitted
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: 8be33e9 ("fib_trie: Fib walk rcu should take a tnode and key instead of a trie and a leaf") Reported-by: Brian Rak <[email protected]> Signed-off-by: Alexander Duyck <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 8fe0129 commit c2229fe

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

net/ipv4/fib_trie.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1569,7 +1569,7 @@ static struct key_vector *leaf_walk_rcu(struct key_vector **tn, t_key key)
15691569
do {
15701570
/* record parent and next child index */
15711571
pn = n;
1572-
cindex = key ? get_index(key, pn) : 0;
1572+
cindex = (key > pn->key) ? get_index(key, pn) : 0;
15731573

15741574
if (cindex >> pn->bits)
15751575
break;

0 commit comments

Comments
 (0)