diff options
| author |   Andrii Nakryiko <andrii@kernel.org> | 2021-11-07 08:55:14 -0800 |
|---|---|---|
| committer |   Alexei Starovoitov <ast@kernel.org> | 2021-11-07 09:14:15 -0800 |
| commit | 8f7b239ea8cfdc8e64c875ee417fed41431a1f37 (patch) | |
| tree | d657618b2e32fd4559e0563a05e32c6665a0dd55 /tools/lib/bpf/libbpf.c | |
| parent | selftests/bpf: Pass sanitizer flags to linker through LDFLAGS (diff) | |
| download | linux-dev-8f7b239ea8cfdc8e64c875ee417fed41431a1f37.tar.xz linux-dev-8f7b239ea8cfdc8e64c875ee417fed41431a1f37.zip | |
libbpf: Free up resources used by inner map definition
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")
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Reviewed-by: Hengqi Chen <hengqi.chen@gmail.com>
Link: https://lore.kernel.org/bpf/20211107165521.9240-3-andrii@kernel.org
Diffstat (limited to 'tools/lib/bpf/libbpf.c')
| -rw-r--r-- | tools/lib/bpf/libbpf.c | 5 |
1 files changed, 4 insertions, 1 deletions
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; } |