From: Ian Rogers <irogers@google.com>
To: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Martin KaFai Lau <kafai@fb.com>, Song Liu <songliubraving@fb.com>,
Yonghong Song <yhs@fb.com>, Andrii Nakryiko <andriin@fb.com>,
John Fastabend <john.fastabend@gmail.com>,
KP Singh <kpsingh@chromium.org>,
netdev@vger.kernel.org, bpf@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Ian Rogers <irogers@google.com>
Subject: [PATCH 2/2] lib/bpf hashmap: fixes to hashmap__clear
Date: Wed, 6 May 2020 13:52:57 -0700 [thread overview]
Message-ID: <20200506205257.8964-3-irogers@google.com> (raw)
In-Reply-To: <20200506205257.8964-1-irogers@google.com>
hashmap_find_entry assumes that if buckets is NULL then there are no
entries. NULL the buckets in clear to ensure this.
Free hashmap entries and not just the bucket array.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/lib/bpf/hashmap.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/tools/lib/bpf/hashmap.c b/tools/lib/bpf/hashmap.c
index 54c30c802070..1a1bca1ff5cd 100644
--- a/tools/lib/bpf/hashmap.c
+++ b/tools/lib/bpf/hashmap.c
@@ -59,7 +59,13 @@ struct hashmap *hashmap__new(hashmap_hash_fn hash_fn,
void hashmap__clear(struct hashmap *map)
{
+ struct hashmap_entry *cur, *tmp;
+ size_t 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.26.2.526.g744177e7f7-goog
next prev parent reply other threads:[~2020-05-06 20:53 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-06 20:52 [PATCH 0/2] lib/bpf hashmap portability and fix Ian Rogers
2020-05-06 20:52 ` [PATCH 1/2] lib/bpf hashmap: increase portability Ian Rogers
2020-05-06 21:33 ` Andrii Nakryiko
2020-05-06 21:47 ` Ian Rogers
2020-05-06 21:56 ` Andrii Nakryiko
2020-05-06 22:13 ` Ian Rogers
2020-05-06 20:52 ` Ian Rogers [this message]
2020-05-06 21:36 ` [PATCH 2/2] lib/bpf hashmap: fixes to hashmap__clear Andrii Nakryiko
2020-05-06 21:53 ` Ian Rogers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200506205257.8964-3-irogers@google.com \
--to=irogers@google.com \
--cc=andriin@fb.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=kpsingh@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=songliubraving@fb.com \
--cc=yhs@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.