diff options
| author | Alexander Duyck <alexander.h.duyck@redhat.com> | 2015-03-10 19:25:41 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-10 21:13:55 +0100 |
| commit | 3ec320dd5c9465fbed3c84dd14ed3941ce757823 (patch) | |
| tree | 5b03973355f122f5ddf9e911cb7e02305e9834f8 | |
| parent | Merge branch 'inet_diag_cleanups' (diff) | |
| download | linux-3ec320dd5c9465fbed3c84dd14ed3941ce757823.tar.xz linux-3ec320dd5c9465fbed3c84dd14ed3941ce757823.zip | |
fib_trie: Correctly handle case of key == 0 in leaf_walk_rcu
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: 8be33e95 ("fib_trie: Fib walk rcu should take a tnode and key instead of a trie and a leaf")
Reported-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: Alexander Duyck <alexander.h.duyck@redhat.com>
Tested-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -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 fcfa9825a816..44cab1d41463 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c @@ -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; |