selftests/bpf: Fix memory leaks in btf_type_c_dump() helper

[ Upstream commit 8ba285874913da21ca39a46376e9cc5ce0f45f94 ]

Free up memory and resources used by temporary allocated memstream and
btf_dump instance.

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

diff --git a/tools/testing/selftests/bpf/btf_helpers.c b/tools/testing/selftests/bpf/btf_helpers.c
index b692e6ead9b55e87a4ba08aedb42853afe0858d8..0a4ad7cb2c200e3c78360125e18b36ef0769ad1c 100644 (file)
--- a/tools/testing/selftests/bpf/btf_helpers.c
+++ b/tools/testing/selftests/bpf/btf_helpers.c
@@ -246,18 +246,23 @@ const char *btf_type_c_dump(const struct btf *btf)
        d = btf_dump__new(btf, NULL, &opts, btf_dump_printf);
        if (libbpf_get_error(d)) {
                fprintf(stderr, "Failed to create btf_dump instance: %ld\n", libbpf_get_error(d));
-               return NULL;
+               goto err_out;
        }
 
        for (i = 1; i <= btf__get_nr_types(btf); i++) {
                err = btf_dump__dump_type(d, i);
                if (err) {
                        fprintf(stderr, "Failed to dump type [%d]: %d\n", i, err);
-                       return NULL;
+                       goto err_out;
                }
        }
 
+       btf_dump__free(d);
        fflush(buf_file);
        fclose(buf_file);
        return buf;
+err_out:
+       btf_dump__free(d);
+       fclose(buf_file);
+       return NULL;
 }