From: Alexander Duyck Date: Tue, 27 Oct 2015 22:06:45 +0000 (-0700) Subject: fib_trie: leaf_walk_rcu should not compute key if key is less than pn->key X-Git-Tag: v4.1.12-92~201^2~61 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=80a99bb7f0185f6b5fce6b22a93a7701ffe0a25b;p=users%2Fjedix%2Flinux-maple.git fib_trie: leaf_walk_rcu should not compute key if key is less than pn->key Orabug: 22623836 [ Upstream commit c2229fe1430d4e1c70e36520229dd64a87802b20 ] 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 Signed-off-by: Alexander Duyck Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman (cherry picked from commit a8cf2fa6a557924d9d3d3ed67bd4afeeac37b91b) Signed-off-by: Dan Duval --- diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index 0ca933db1b41..93b802984819 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c @@ -1547,7 +1547,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;