lkml.org 
[lkml]   [2009]   [Jan]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 19/46] ipv6: Fix fib6_dump_table walker leak
    2.6.28-stable review patch.  If anyone has any objections, please let us know.

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

    From: Herbert Xu <herbert@gondor.apana.org.au>

    [ Upstream commit: 7891cc818967e186be68caac32d84bfd0a3f0bd2 ]

    When a fib6 table dump is prematurely ended, we won't unlink
    its walker from the list. This causes all sorts of grief for
    other users of the list later.

    Reported-by: Chris Caputo <ccaputo@alt.net>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    net/ipv6/ip6_fib.c | 15 ++++++++-------
    1 file changed, 8 insertions(+), 7 deletions(-)

    --- a/net/ipv6/ip6_fib.c
    +++ b/net/ipv6/ip6_fib.c
    @@ -298,6 +298,10 @@ static void fib6_dump_end(struct netlink
    struct fib6_walker_t *w = (void*)cb->args[2];

    if (w) {
    + if (cb->args[4]) {
    + cb->args[4] = 0;
    + fib6_walker_unlink(w);
    + }
    cb->args[2] = 0;
    kfree(w);
    }
    @@ -330,15 +334,12 @@ static int fib6_dump_table(struct fib6_t
    read_lock_bh(&table->tb6_lock);
    res = fib6_walk_continue(w);
    read_unlock_bh(&table->tb6_lock);
    - if (res != 0) {
    - if (res < 0)
    - fib6_walker_unlink(w);
    - goto end;
    + if (res <= 0) {
    + fib6_walker_unlink(w);
    + cb->args[4] = 0;
    }
    - fib6_walker_unlink(w);
    - cb->args[4] = 0;
    }
    -end:
    +
    return res;
    }



    \
     
     \ /
      Last update: 2009-01-23 02:23    [W:4.265 / U:0.552 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site