lkml.org 
[lkml]   [2020]   [May]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 187/312] ipv4: Fix memory leak in exception case for splitting tries
    Date
    From: Alexander Duyck <alexander.h.duyck@intel.com>

    commit 3114cdfe66c156345b0ae34e2990472f277e0c1b upstream.

    Fix a small memory leak that can occur where we leak a fib_alias in the
    event of us not being able to insert it into the local table.

    Fixes: 0ddcf43d5d4a0 ("ipv4: FIB Local/MAIN table collapse")
    Reported-by: Eric Dumazet <edumazet@google.com>
    Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
    Acked-by: Eric Dumazet <edumazet@google.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    net/ipv4/fib_trie.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- a/net/ipv4/fib_trie.c
    +++ b/net/ipv4/fib_trie.c
    @@ -1714,8 +1714,10 @@ struct fib_table *fib_trie_unmerge(struc
    local_l = fib_find_node(lt, &local_tp, l->key);

    if (fib_insert_alias(lt, local_tp, local_l, new_fa,
    - NULL, l->key))
    + NULL, l->key)) {
    + kmem_cache_free(fn_alias_kmem, new_fa);
    goto out;
    + }
    }

    /* stop loop if key wrapped back to 0 */

    \
     
     \ /
      Last update: 2020-05-08 14:44    [W:4.191 / U:0.220 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site