lkml.org 
[lkml]   [2013]   [Sep]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 046/104] ipv6: don't stop backtracking in fib6_lookup_1 if subtree does not match
    Date
    3.5.7.22 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Hannes Frederic Sowa <hannes@stressinduktion.org>

    commit 3e3be275851bc6fc90bfdcd732cd95563acd982b upstream.

    In case a subtree did not match we currently stop backtracking and return
    NULL (root table from fib_lookup). This could yield in invalid routing
    table lookups when using subtrees.

    Instead continue to backtrack until a valid subtree or node is found
    and return this match.

    Also remove unneeded NULL check.

    Reported-by: Teco Boot <teco@inf-net.nl>
    Cc: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
    Cc: David Lamparter <equinox@diac24.net>
    Cc: <boutier@pps.univ-paris-diderot.fr>
    Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    net/ipv6/ip6_fib.c | 16 ++++++++++++----
    1 file changed, 12 insertions(+), 4 deletions(-)

    diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
    index 0907191..3c30320 100644
    --- a/net/ipv6/ip6_fib.c
    +++ b/net/ipv6/ip6_fib.c
    @@ -949,14 +949,22 @@ static struct fib6_node * fib6_lookup_1(struct fib6_node *root,

    if (ipv6_prefix_equal(&key->addr, args->addr, key->plen)) {
    #ifdef CONFIG_IPV6_SUBTREES
    - if (fn->subtree)
    - fn = fib6_lookup_1(fn->subtree, args + 1);
    + if (fn->subtree) {
    + struct fib6_node *sfn;
    + sfn = fib6_lookup_1(fn->subtree,
    + args + 1);
    + if (!sfn)
    + goto backtrack;
    + fn = sfn;
    + }
    #endif
    - if (!fn || fn->fn_flags & RTN_RTINFO)
    + if (fn->fn_flags & RTN_RTINFO)
    return fn;
    }
    }
    -
    +#ifdef CONFIG_IPV6_SUBTREES
    +backtrack:
    +#endif
    if (fn->fn_flags & RTN_ROOT)
    break;

    --
    1.8.3.2


    \
     
     \ /
      Last update: 2013-09-30 13:21    [W:2.235 / U:0.280 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site