From: Andrii Nakryiko <andrii@kernel.org>
To: <bpf@vger.kernel.org>, <ast@kernel.org>, <daniel@iogearbox.net>
Cc: <andrii@kernel.org>, <kernel-team@fb.com>,
Hengqi Chen <hengqi.chen@gmail.com>
Subject: [PATCH v4 bpf-next 2/9] libbpf: free up resources used by inner map definition
Date: Sun, 7 Nov 2021 08:55:14 -0800 [thread overview]
Message-ID: <20211107165521.9240-3-andrii@kernel.org> (raw)
In-Reply-To: <20211107165521.9240-1-andrii@kernel.org>
It's not enough to just free(map->inner_map), as inner_map itself can
have extra memory allocated, like map name.
Fixes: 646f02ffdd49 ("libbpf: Add BTF-defined map-in-map support")
Reviewed-by: Hengqi Chen <hengqi.chen@gmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
---
tools/lib/bpf/libbpf.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index dfd15cc60ea7..d869ebee1e27 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -9009,7 +9009,10 @@ int bpf_map__set_inner_map_fd(struct bpf_map *map, int fd)
pr_warn("error: inner_map_fd already specified\n");
return libbpf_err(-EINVAL);
}
- zfree(&map->inner_map);
+ if (map->inner_map) {
+ bpf_map__destroy(map->inner_map);
+ zfree(&map->inner_map);
+ }
map->inner_map_fd = fd;
return 0;
}
--
2.30.2
next prev parent reply other threads:[~2021-11-07 16:55 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-07 16:55 [PATCH v4 bpf-next 0/9] Fix leaks in libbpf and selftests Andrii Nakryiko
2021-11-07 16:55 ` [PATCH v4 bpf-next 1/9] selftests/bpf: pass sanitizer flags to linker through LDFLAGS Andrii Nakryiko
2021-11-07 16:55 ` Andrii Nakryiko [this message]
2021-11-07 16:55 ` [PATCH v4 bpf-next 3/9] selftests/bpf: fix memory leaks in btf_type_c_dump() helper Andrii Nakryiko
2021-11-07 16:55 ` [PATCH v4 bpf-next 4/9] selftests/bpf: free per-cpu values array in bpf_iter selftest Andrii Nakryiko
2021-11-07 16:55 ` [PATCH v4 bpf-next 5/9] selftests/bpf: free inner strings index in btf selftest Andrii Nakryiko
2021-11-07 16:55 ` [PATCH v4 bpf-next 6/9] selftests/bpf: clean up btf and btf_dump in dump_datasec test Andrii Nakryiko
2021-11-07 16:55 ` [PATCH v4 bpf-next 7/9] selftests/bpf: avoid duplicate btf__parse() call Andrii Nakryiko
2021-11-07 16:55 ` [PATCH v4 bpf-next 8/9] selftests/bpf: destroy XDP link correctly Andrii Nakryiko
2021-11-07 16:55 ` [PATCH v4 bpf-next 9/9] selftests/bpf: fix bpf_object leak in skb_ctx selftest Andrii Nakryiko
2021-11-07 17:15 ` [PATCH v4 bpf-next 0/9] Fix leaks in libbpf and selftests Alexei Starovoitov
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=20211107165521.9240-3-andrii@kernel.org \
--to=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=hengqi.chen@gmail.com \
--cc=kernel-team@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).