lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 758/849] perf bpf: Add missing free to bpf_event__print_bpf_prog_info()
    Date
    From: Ian Rogers <irogers@google.com>

    [ Upstream commit 88c42f4d6cb249eb68524282f8d4cc32f9059984 ]

    If btf__new() is called then there needs to be a corresponding btf__free().

    Fixes: f8dfeae009effc0b ("perf bpf: Show more BPF program info in print_bpf_prog_info()")
    Signed-off-by: Ian Rogers <irogers@google.com>
    Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
    Cc: Alexei Starovoitov <ast@kernel.org>
    Cc: Andrii Nakryiko <andrii@kernel.org>
    Cc: Daniel Borkmann <daniel@iogearbox.net>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Cc: John Fastabend <john.fastabend@gmail.com>
    Cc: KP Singh <kpsingh@kernel.org>
    Cc: Mark Rutland <mark.rutland@arm.com>
    Cc: Martin KaFai Lau <kafai@fb.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Song Liu <songliubraving@fb.com>
    Cc: Stephane Eranian <eranian@google.com>
    Cc: Tiezhu Yang <yangtiezhu@loongson.cn>
    Cc: Yonghong Song <yhs@fb.com>
    Cc: bpf@vger.kernel.org
    Cc: netdev@vger.kernel.org
    Link: http://lore.kernel.org/lkml/20211106053733.3580931-2-irogers@google.com
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/perf/util/bpf-event.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/tools/perf/util/bpf-event.c b/tools/perf/util/bpf-event.c
    index 17a9844e4fbf8..53d6c6f449c9c 100644
    --- a/tools/perf/util/bpf-event.c
    +++ b/tools/perf/util/bpf-event.c
    @@ -564,7 +564,7 @@ void bpf_event__print_bpf_prog_info(struct bpf_prog_info *info,
    synthesize_bpf_prog_name(name, KSYM_NAME_LEN, info, btf, 0);
    fprintf(fp, "# bpf_prog_info %u: %s addr 0x%llx size %u\n",
    info->id, name, prog_addrs[0], prog_lens[0]);
    - return;
    + goto out;
    }

    fprintf(fp, "# bpf_prog_info %u:\n", info->id);
    @@ -574,4 +574,6 @@ void bpf_event__print_bpf_prog_info(struct bpf_prog_info *info,
    fprintf(fp, "# \tsub_prog %u: %s addr 0x%llx size %u\n",
    i, name, prog_addrs[i], prog_lens[i]);
    }
    +out:
    + btf__free(btf);
    }
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 00:23    [W:2.620 / U:0.296 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site