diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2023-08-27 00:32:45 +0300 |
|---|---|---|
| committer | Sasha Levin <sashal@kernel.org> | 2024-03-27 01:19:52 +0300 |
| commit | dfde5becadf6c1146f7ee1a6e162ec030dede92c (patch) | |
| tree | 99e889a72aa5ce505659e2ec203943539d1f0099 /tools/perf | |
| parent | 05173ef70742026af8ddcf1d4c3df66cb4b9c0d9 (diff) | |
| download | linux-dfde5becadf6c1146f7ee1a6e162ec030dede92c.tar.xz | |
perf pmu: Fix a potential memory leak in perf_pmu__lookup()
[ Upstream commit ef5de1613d7d92bdc975e6beb34bb0fa94f34078 ]
The commit in Fixes has reordered some code, but missed an error handling
path.
'goto err' now, in order to avoid a memory leak in case of error.
Fixes: f63a536f03a2 ("perf pmu: Merge JSON events with sysfs at load time")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Ian Rogers <irogers@google.com>
Cc: kernel-janitors@vger.kernel.org
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/9538b2b634894c33168dfe9d848d4df31fd4d801.1693085544.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/util/pmu.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index a3c7814116c7..86bfdf5db213 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -992,10 +992,9 @@ struct perf_pmu *perf_pmu__lookup(struct list_head *pmus, int dirfd, const char * type value and format definitions. Load both right * now. */ - if (pmu_format(pmu, dirfd, name)) { - free(pmu); - return NULL; - } + if (pmu_format(pmu, dirfd, name)) + goto err; + pmu->is_core = is_pmu_core(name); pmu->cpus = pmu_cpumask(dirfd, name, pmu->is_core); |