lkml.org 
[lkml]   [2018]   [Oct]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.18 183/228] bpf, sockmap: fix sock hash count in alloc_sock_hash_elem
    Date
    4.18-stable review patch.  If anyone has any objections, please let me know.

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

    From: Daniel Borkmann <daniel@iogearbox.net>

    [ Upstream commit eb29429d81e31b191f3b2bd19cf820279cec6463 ]

    When we try to allocate a new sock hash entry and the allocation
    fails, then sock hash map fails to reduce the map element counter,
    meaning we keep accounting this element although it was never used.
    Fix it by dropping the element counter on error.

    Fixes: 81110384441a ("bpf: sockmap, add hash map support")
    Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
    Acked-by: John Fastabend <john.fastabend@gmail.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    kernel/bpf/sockmap.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- a/kernel/bpf/sockmap.c
    +++ b/kernel/bpf/sockmap.c
    @@ -2272,8 +2272,10 @@ static struct htab_elem *alloc_sock_hash
    }
    l_new = kmalloc_node(htab->elem_size, GFP_ATOMIC | __GFP_NOWARN,
    htab->map.numa_node);
    - if (!l_new)
    + if (!l_new) {
    + atomic_dec(&htab->count);
    return ERR_PTR(-ENOMEM);
    + }

    memcpy(l_new->key, key, key_size);
    l_new->sk = sk;

    \
     
     \ /
      Last update: 2018-10-02 16:01    [W:5.648 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site