lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sun, 29 Dec 2019 18:25:13 +0100 From: Greg Kroah-Hartman <gregkh@...uxfoundation.org> To: linux-kernel@...r.kernel.org Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>, stable@...r.kernel.org, Ian Rogers <irogers@...gle.com>, Jiri Olsa <jolsa@...nel.org>, Adrian Hunter <adrian.hunter@...el.com>, Alexander Shishkin <alexander.shishkin@...ux.intel.com>, Alexei Starovoitov <ast@...nel.org>, Andi Kleen <ak@...ux.intel.com>, Daniel Borkmann <daniel@...earbox.net>, Jin Yao <yao.jin@...ux.intel.com>, John Garry <john.garry@...wei.com>, Kan Liang <kan.liang@...ux.intel.com>, Mark Rutland <mark.rutland@....com>, Martin KaFai Lau <kafai@...com>, Namhyung Kim <namhyung@...nel.org>, Peter Zijlstra <peterz@...radead.org>, Song Liu <songliubraving@...com>, Stephane Eranian <eranian@...gle.com>, Yonghong Song <yhs@...com>, bpf@...r.kernel.org, clang-built-linux@...glegroups.com, netdev@...r.kernel.org, Arnaldo Carvalho de Melo <acme@...hat.com>, Sasha Levin <sashal@...nel.org> Subject: [PATCH 5.4 260/434] perf parse: If pmu configuration fails free terms From: Ian Rogers <irogers@...gle.com> [ Upstream commit 38f2c4226e6bc3e8c41c318242821ba5dc825aba ] Avoid a memory leak when the configuration fails. Signed-off-by: Ian Rogers <irogers@...gle.com> Acked-by: Jiri Olsa <jolsa@...nel.org> Cc: Adrian Hunter <adrian.hunter@...el.com> Cc: Alexander Shishkin <alexander.shishkin@...ux.intel.com> Cc: Alexei Starovoitov <ast@...nel.org> Cc: Andi Kleen <ak@...ux.intel.com> Cc: Daniel Borkmann <daniel@...earbox.net> Cc: Jin Yao <yao.jin@...ux.intel.com> Cc: John Garry <john.garry@...wei.com> Cc: Kan Liang <kan.liang@...ux.intel.com> Cc: Mark Rutland <mark.rutland@....com> Cc: Martin KaFai Lau <kafai@...com> Cc: Namhyung Kim <namhyung@...nel.org> Cc: Peter Zijlstra <peterz@...radead.org> Cc: Song Liu <songliubraving@...com> Cc: Stephane Eranian <eranian@...gle.com> Cc: Yonghong Song <yhs@...com> Cc: bpf@...r.kernel.org Cc: clang-built-linux@...glegroups.com Cc: netdev@...r.kernel.org Link: http://lore.kernel.org/lkml/20191030223448.12930-9-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com> Signed-off-by: Sasha Levin <sashal@...nel.org> --- tools/perf/util/parse-events.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index d5ea043d3fc4..422ad1888e74 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -1365,8 +1365,15 @@ int parse_events_add_pmu(struct parse_events_state *parse_state, if (get_config_terms(head_config, &config_terms)) return -ENOMEM; - if (perf_pmu__config(pmu, &attr, head_config, parse_state->error)) + if (perf_pmu__config(pmu, &attr, head_config, parse_state->error)) { + struct perf_evsel_config_term *pos, *tmp; + + list_for_each_entry_safe(pos, tmp, &config_terms, list) { + list_del_init(&pos->list); + free(pos); + } return -EINVAL; + } evsel = __add_event(list, &parse_state->idx, &attr, get_config_name(head_config), pmu, -- 2.20.1
Powered by blists - more mailing lists