libbpf: Fix memory leak and possible double-free in hashmap__clear

[ 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>

diff --git a/tools/lib/bpf/hashmap.c b/tools/lib/bpf/hashmap.c
index 54c30c8020705e9569366bfcdc2f57138eb204be..cffb96202e0d8e8aed4d98a1df5bde751805fa29 100644 (file)
--- 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;
 }