From: Brian Rak <brak@gameservers•com>
To: Alexander Duyck <aduyck@mirantis•com>,
netdev@vger•kernel.org, davem@davemloft•net
Subject: Re: [net PATCH] fib_trie: leaf_walk_rcu should not compute key if key is less than pn->key
Date: Tue, 27 Oct 2015 20:18:36 -0400 [thread overview]
Message-ID: <5630145C.3020706@gameservers.com> (raw)
In-Reply-To: <20151027220352.1312.18265.stgit@ahduyck-vm-fedora22>
On 10/27/2015 6:06 PM, Alexander Duyck wrote:
> 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 <brak@gameservers•com>
> Signed-off-by: Alexander Duyck <aduyck@mirantis•com>
> ---
>
> This will need to be queued up for stable as well. This applies to 4.1 and
> 4.2 kernels as well.
>
> net/ipv4/fib_trie.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
> index 6c2af797f2f9..744e5936c10d 100644
> --- a/net/ipv4/fib_trie.c
> +++ b/net/ipv4/fib_trie.c
> @@ -1569,7 +1569,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;
>
Just built 4.2.5 with this patch, and everything works fine. Thanks for
your help!
next prev parent reply other threads:[~2015-10-28 0:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-27 22:06 [net PATCH] fib_trie: leaf_walk_rcu should not compute key if key is less than pn->key Alexander Duyck
2015-10-28 0:18 ` Brian Rak [this message]
2015-10-28 1:15 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5630145C.3020706@gameservers.com \
--to=brak@gameservers$(echo .)com \
--cc=aduyck@mirantis$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox