lkml.org 
[lkml]   [2020]   [Jun]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 022/376] libbpf: Fix memory leak and possible double-free in hashmap__clear
    Date
    From: Andrii Nakryiko <andriin@fb.com>

    [ Upstream commit 229bf8bf4d910510bc1a2fd0b89bd467cd71050d ]

    Fix memory leak in hashmap_clear() not freeing hashmap_entry structs for each
    of the remaining entries. Also NULL-out bucket list to prevent possible
    double-free between hashmap__clear() and hashmap__free().

    Running test_progs-asan flavor clearly showed this problem.

    Reported-by: Alston Tang <alston64@fb.com>
    Signed-off-by: Andrii Nakryiko <andriin@fb.com>
    Signed-off-by: Alexei Starovoitov <ast@kernel.org>
    Link: https://lore.kernel.org/bpf/20200429012111.277390-5-andriin@fb.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/lib/bpf/hashmap.c | 7 +++++++
    1 file changed, 7 insertions(+)

    diff --git a/tools/lib/bpf/hashmap.c b/tools/lib/bpf/hashmap.c
    index 54c30c802070..cffb96202e0d 100644
    --- a/tools/lib/bpf/hashmap.c
    +++ b/tools/lib/bpf/hashmap.c
    @@ -59,7 +59,14 @@ struct hashmap *hashmap__new(hashmap_hash_fn hash_fn,

    void hashmap__clear(struct hashmap *map)
    {
    + struct hashmap_entry *cur, *tmp;
    + int bkt;
    +
    + hashmap__for_each_entry_safe(map, cur, tmp, bkt) {
    + free(cur);
    + }
    free(map->buckets);
    + map->buckets = NULL;
    map->cap = map->cap_bits = map->sz = 0;
    }

    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-19 17:21    [W:4.018 / U:1.864 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site