raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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: d56354dc49 ("perf tools: Save bpf_prog_info and BTF of new BPF programs")
Reviewed-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Zhongqiu 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: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Zhongqiu Han
2024-12-05 16:45:00 +08:00
committed by Arnaldo Carvalho de Melo
parent a7da6c7030
commit 03edb7020b
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/perf/util/bpf-event.c
View File

@@ -289,7 +289,10 @@ static int perf_event__synthesize_one_bpf_prog(struct perf_session *session,
} }
info_node->info_linear = 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);
}
info_linear = NULL; 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)); info_node = malloc(sizeof(struct bpf_prog_info_node));
if (info_node) { if (info_node) {
info_node->info_linear = 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);
}
} else } else
free(info_linear); free(info_linear);

8
tools/perf/util/env.c
View File

@@ -24,12 +24,16 @@ struct perf_env perf_env;
#include "bpf-utils.h" #include "bpf-utils.h"
#include <bpf/libbpf.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) struct bpf_prog_info_node *info_node)
{ {
bool ret;
down_write(&env->bpf_progs.lock); 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); 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) bool __perf_env__insert_bpf_prog_info(struct perf_env *env, struct bpf_prog_info_node *info_node)

2
tools/perf/util/env.h
View File

@@ -178,7 +178,7 @@ int perf_env__nr_cpus_avail(struct perf_env *env);
void perf_env__init(struct perf_env *env); void perf_env__init(struct perf_env *env);
bool __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 *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 *info_node);
struct bpf_prog_info_node *perf_env__find_bpf_prog_info(struct perf_env *env, struct bpf_prog_info_node *perf_env__find_bpf_prog_info(struct perf_env *env,
__u32 prog_id); __u32 prog_id);