lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0550/1039] selftests/bpf: Fix memory leaks in btf_type_c_dump() helper
    Date
    From: Andrii Nakryiko <andrii@kernel.org>

    [ 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>
    ---
    tools/testing/selftests/bpf/btf_helpers.c | 9 +++++++--
    1 file changed, 7 insertions(+), 2 deletions(-)

    diff --git a/tools/testing/selftests/bpf/btf_helpers.c b/tools/testing/selftests/bpf/btf_helpers.c
    index b5b6b013a245e..3d1a748d09d81 100644
    --- a/tools/testing/selftests/bpf/btf_helpers.c
    +++ b/tools/testing/selftests/bpf/btf_helpers.c
    @@ -251,18 +251,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__type_cnt(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;
    }
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-25 01:11    [W:2.169 / U:0.920 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site