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

perf header: Fix one memory leakage in process_bpf_prog_info() 



Function __perf_env__insert_bpf_prog_info() will return without inserting
bpf prog info node into perf env again due to a duplicate bpf prog info
node insertion, causing the temporary info_linear and info_node memory to
leak. Modify the return type of this function to bool and add a check to
ensure the memory is freed if the function returns false.

Fixes: 606f972b ("perf bpf: Save bpf_prog_info information as headers to perf.data")
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-3-quic_zhonhan@quicinc.com


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

tools/perf/util/env.c

+3 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ void perf_env__insert_bpf_prog_info(struct perf_env *env, 
	up_write(&env->bpf_progs.lock);

}



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

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

{

	__u32 prog_id = info_node->info_linear->info.id;

	struct bpf_prog_info_node *node;
@@ -50,13 +50,14 @@ void __perf_env__insert_bpf_prog_info(struct perf_env *env, struct bpf_prog_info 
			p = &(*p)->rb_right;

		} else {

			pr_debug("duplicated bpf prog info %u\n", prog_id);

			return;

			return false;

		}

	}



	rb_link_node(&info_node->rb_node, parent, p);

	rb_insert_color(&info_node->rb_node, &env->bpf_progs.infos);

	env->bpf_progs.infos_cnt++;

	return true;

}



struct bpf_prog_info_node *perf_env__find_bpf_prog_info(struct perf_env *env,

tools/perf/util/env.h

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ const char *perf_env__raw_arch(struct perf_env *env); 
int perf_env__nr_cpus_avail(struct perf_env *env);



void perf_env__init(struct perf_env *env);

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);

void perf_env__insert_bpf_prog_info(struct perf_env *env,

				    struct bpf_prog_info_node *info_node);

tools/perf/util/header.c

+4 −1
Original line number Diff line number Diff line
@@ -3158,7 +3158,10 @@ static int process_bpf_prog_info(struct feat_fd *ff, void *data __maybe_unused) 
		/* after reading from file, translate offset to address */

		bpil_offs_to_addr(info_linear);

		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);

		}

	}



	up_write(&env->bpf_progs.lock);