Commit 03edb702 authored by Zhongqiu Han's avatar Zhongqiu Han Committed by Arnaldo Carvalho de Melo
Browse files

perf bpf: Fix two memory leakages when calling perf_env__insert_bpf_prog_info() 



If perf_env__insert_bpf_prog_info() returns false due to a duplicate bpf
prog info node insertion, the temporary info_node and info_linear memory
will leak. Add a check to ensure the memory is freed if the function
returns false.

Fixes: d56354dc ("perf tools: Save bpf_prog_info and BTF of new BPF programs")
Reviewed-by: default avatarNamhyung Kim <namhyung@kernel.org>
Signed-off-by: default avatarZhongqiu Han <quic_zhonhan@quicinc.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@linaro.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Song Liu <song@kernel.org>
Cc: Yicong Yang <yangyicong@hisilicon.com>
Link: https://lore.kernel.org/r/20241205084500.823660-4-quic_zhonhan@quicinc.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent a7da6c70

tools/perf/util/bpf-event.c

+8 −2
Original line number Diff line number Diff line
@@ -289,7 +289,10 @@ static int perf_event__synthesize_one_bpf_prog(struct perf_session *session, 
		}



		info_node->info_linear = info_linear;

		perf_env__insert_bpf_prog_info(env, info_node);

		if (!perf_env__insert_bpf_prog_info(env, info_node)) {

			free(info_linear);

			free(info_node);

		}

		info_linear = NULL;



		/*
@@ -480,7 +483,10 @@ static void perf_env__add_bpf_info(struct perf_env *env, u32 id) 
	info_node = malloc(sizeof(struct bpf_prog_info_node));

	if (info_node) {

		info_node->info_linear = info_linear;

		perf_env__insert_bpf_prog_info(env, info_node);

		if (!perf_env__insert_bpf_prog_info(env, info_node)) {

			free(info_linear);

			free(info_node);

		}

	} else

		free(info_linear);

tools/perf/util/env.c

+6 −2
Original line number Diff line number Diff line
@@ -24,12 +24,16 @@ struct perf_env perf_env; 
#include "bpf-utils.h"

#include <bpf/libbpf.h>



void perf_env__insert_bpf_prog_info(struct perf_env *env,

bool perf_env__insert_bpf_prog_info(struct perf_env *env,

				    struct bpf_prog_info_node *info_node)

{

	bool ret;



	down_write(&env->bpf_progs.lock);

	__perf_env__insert_bpf_prog_info(env, info_node);

	ret = __perf_env__insert_bpf_prog_info(env, info_node);

	up_write(&env->bpf_progs.lock);



	return ret;

}



bool __perf_env__insert_bpf_prog_info(struct perf_env *env, struct bpf_prog_info_node *info_node)

tools/perf/util/env.h

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ int perf_env__nr_cpus_avail(struct perf_env *env); 
void perf_env__init(struct perf_env *env);

bool __perf_env__insert_bpf_prog_info(struct perf_env *env,

				      struct bpf_prog_info_node *info_node);

void perf_env__insert_bpf_prog_info(struct perf_env *env,

bool perf_env__insert_bpf_prog_info(struct perf_env *env,

				    struct bpf_prog_info_node *info_node);

struct bpf_prog_info_node *perf_env__find_bpf_prog_info(struct perf_env *env,

							__u32 prog_id);