lkml.org 
[lkml]   [2020]   [Jun]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 125/376] libbpf: Fix huge memory leak in libbpf_find_vmlinux_btf_id()
    Date
    From: Andrii Nakryiko <andriin@fb.com>

    [ Upstream commit 3521ffa2ee9a48c3236c93f54ae11c074490ebce ]

    BTF object wasn't freed.

    Fixes: a6ed02cac690 ("libbpf: Load btf_vmlinux only once per object.")
    Signed-off-by: Andrii Nakryiko <andriin@fb.com>
    Signed-off-by: Alexei Starovoitov <ast@kernel.org>
    Cc: KP Singh <kpsingh@google.com>
    Link: https://lore.kernel.org/bpf/20200429012111.277390-9-andriin@fb.com
    Signed-off-by: Sasha Levin <sashal@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 63fc872723fc..cd53204d33f0 100644
    --- a/tools/lib/bpf/libbpf.c
    +++ b/tools/lib/bpf/libbpf.c
    @@ -6688,6 +6688,7 @@ int libbpf_find_vmlinux_btf_id(const char *name,
    enum bpf_attach_type attach_type)
    {
    struct btf *btf;
    + int err;

    btf = libbpf_find_kernel_btf();
    if (IS_ERR(btf)) {
    @@ -6695,7 +6696,9 @@ int libbpf_find_vmlinux_btf_id(const char *name,
    return -EINVAL;
    }

    - return __find_vmlinux_btf_id(btf, name, attach_type);
    + err = __find_vmlinux_btf_id(btf, name, attach_type);
    + btf__free(btf);
    + return err;
    }

    static int libbpf_find_prog_btf_id(const char *name, __u32 attach_prog_fd)
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-19 17:25    [W:4.511 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site