Re: [PATCH v2] perf bpf: Fix memory leaks relating to BTF.

From: kajoljain
Date: Fri Aug 27 2021 - 03:28:50 EST


Patch looks good me.

Reviewed-by: Kajol Jain<kjain@xxxxxxxxxxxxx>

Thanks,
Kajol Jain

On 8/27/21 12:18 AM, Ian Rogers wrote:
> BTF needs to be freed with btf__free.
>
> Signed-off-by: Ian Rogers <irogers@xxxxxxxxxx>
> ---
> tools/perf/util/annotate.c | 2 +-
> tools/perf/util/bpf-event.c | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
> index d43f6b5e5169..0bae061b2d6d 100644
> --- a/tools/perf/util/annotate.c
> +++ b/tools/perf/util/annotate.c
> @@ -1833,7 +1833,7 @@ static int symbol__disassemble_bpf(struct symbol *sym,
> ret = 0;
> out:
> free(prog_linfo);
> - free(btf);
> + btf__free(btf);
> fclose(s);
> bfd_close(bfdf);
> return ret;
> diff --git a/tools/perf/util/bpf-event.c b/tools/perf/util/bpf-event.c
> index cdecda1ddd36..17a9844e4fbf 100644
> --- a/tools/perf/util/bpf-event.c
> +++ b/tools/perf/util/bpf-event.c
> @@ -296,7 +296,7 @@ static int perf_event__synthesize_one_bpf_prog(struct perf_session *session,
>
> out:
> free(info_linear);
> - free(btf);
> + btf__free(btf);
> return err ? -1 : 0;
> }
>
> @@ -486,7 +486,7 @@ static void perf_env__add_bpf_info(struct perf_env *env, u32 id)
> perf_env__fetch_btf(env, btf_id, btf);
>
> out:
> - free(btf);
> + btf__free(btf);
> close(fd);
> }
>
>