UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

perf sched: Fix memory leak in perf_sched__map() 

[ Upstream commit ef76a5af819743d405674f6de5d0e63320ac653e ]

perf_sched__map() needs to free memory of map_cpus, color_pids and
color_cpus in normal path and rollback allocated memory in error path.

Signed-off-by: Yang Jihong <yangjihong1@huawei.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20240206083228.172607-3-yangjihong1@huawei.com
Stable-dep-of: 1a5efc9e13f3 ("libsubcmd: Don't free the usage string")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Yang Jihong 2024-02-06 08:32:25 +00:00 committed by Greg Kroah-Hartman
parent 85ca3d45bd
commit e649fb7f83
1 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
tools/perf/builtin-sched.c
View File

@ -3252,8 +3252,6 @@ static int perf_sched__lat(struct perf_sched *sched)
static int setup_map_cpus(struct perf_sched *sched) static int setup_map_cpus(struct perf_sched *sched)
{ {
struct perf_cpu_map *map;
sched->max_cpu.cpu = sysconf(_SC_NPROCESSORS_CONF); sched->max_cpu.cpu = sysconf(_SC_NPROCESSORS_CONF);
if (sched->map.comp) { if (sched->map.comp) {
@ -3262,16 +3260,15 @@ static int setup_map_cpus(struct perf_sched *sched)
return -1; return -1;
} }
if (!sched->map.cpus_str) if (sched->map.cpus_str) {
return 0; sched->map.cpus = perf_cpu_map__new(sched->map.cpus_str);
if (!sched->map.cpus) {
map = perf_cpu_map__new(sched->map.cpus_str); pr_err("failed to get cpus map from %s\n", sched->map.cpus_str);
if (!map) { zfree(&sched->map.comp_cpus);
pr_err("failed to get cpus map from %s\n", sched->map.cpus_str); return -1;
return -1; }
} }
sched->map.cpus = map;
return 0; return 0;
} }
@ -3311,20 +3308,34 @@ static int setup_color_cpus(struct perf_sched *sched)
static int perf_sched__map(struct perf_sched *sched) static int perf_sched__map(struct perf_sched *sched)
{ {
int rc = -1;
if (setup_map_cpus(sched)) if (setup_map_cpus(sched))
return -1; return rc;
if (setup_color_pids(sched)) if (setup_color_pids(sched))
return -1; goto out_put_map_cpus;
if (setup_color_cpus(sched)) if (setup_color_cpus(sched))
return -1; goto out_put_color_pids;
setup_pager(); setup_pager();
if (perf_sched__read_events(sched)) if (perf_sched__read_events(sched))
return -1; goto out_put_color_cpus;
rc = 0;
print_bad_events(sched); print_bad_events(sched);
return 0;
out_put_color_cpus:
perf_cpu_map__put(sched->map.color_cpus);
out_put_color_pids:
perf_thread_map__put(sched->map.color_pids);
out_put_map_cpus:
zfree(&sched->map.comp_cpus);
perf_cpu_map__put(sched->map.cpus);
return rc;
} }
static int perf_sched__replay(struct perf_sched *sched) static int perf_sched__replay(struct perf_sched *sched)