libbpf: Free up resources used by inner map definition

[ Upstream commit 8f7b239ea8cfdc8e64c875ee417fed41431a1f37 ]

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
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index 7145463a4a562a3a530ad278a6da000a19361924..0ad29203cbfbfdaf8fdd6446a278536a65a18301 100644 (file)
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -8676,7 +8676,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;
 }