Skip to content

Commit

Permalink
fib_trie: Correctly handle case of key == 0 in leaf_walk_rcu
Browse files Browse the repository at this point in the history
In the case of a trie that had no tnodes with a key of 0 the initial
look-up would fail resulting in an out-of-bounds cindex on the first tnode.
This resulted in an entire trie being skipped.

In order resolve this I have updated the cindex logic in the initial
look-up so that if the key is zero we will always traverse the child zero
path.

Fixes: 8be33e9 ("fib_trie: Fib walk rcu should take a tnode and key instead of a trie and a leaf")
Reported-by: Sabrina Dubroca <[email protected]>
Signed-off-by: Alexander Duyck <[email protected]>
Tested-by: Sabrina Dubroca <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
Alexander Duyck authored and davem330 committed Mar 10, 2015
1 parent 7c23aaf commit 3ec320d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion net/ipv4/fib_trie.c
Original file line number Diff line number Diff line change
Expand Up @@ -1530,7 +1530,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 = get_index(key, pn);
cindex = key ? get_index(key, pn) : 0;

if (cindex >> pn->bits)
break;
Expand Down

0 comments on commit 3ec320d

Please sign in to comment.