Commit 33321a06 authored Aug 25, 2020 by Ian Rogers Committed by Arnaldo Carvalho de Melo Sep 01, 2020

perf parse-events: Avoid an uninitialized read when using fake PMUs



With a fake_pmu the pmu_info isn't populated by perf_pmu__check_alias.
In this case, don't try to copy the uninitialized values to the evsel.

Signed-off-by: Ian Rogers <irogers@google.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lore.kernel.org/lkml/20200826042910.1902374-2-irogers@google.com


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 313146a8

tools/perf/util/parse-events.c

+17 −13

Original line number	Diff line number	Diff line
		@@ -1534,19 +1534,23 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,
		evsel = __add_event(list, &parse_state->idx, &attr, true,
		get_config_name(head_config), pmu,
		&config_terms, auto_merge_stats, NULL);
		if (evsel) {
		if (!evsel)
		return -ENOMEM;

		evsel->pmu_name = name ? strdup(name) : NULL;
		evsel->use_uncore_alias = use_uncore_alias;
		evsel->percore = config_term_percore(&evsel->config_terms);

		if (parse_state->fake_pmu)
		return 0;

		evsel->unit = info.unit;
		evsel->scale = info.scale;
		evsel->per_pkg = info.per_pkg;
		evsel->snapshot = info.snapshot;
		evsel->metric_expr = info.metric_expr;
		evsel->metric_name = info.metric_name;
		evsel->pmu_name = name ? strdup(name) : NULL;
		evsel->use_uncore_alias = use_uncore_alias;
		evsel->percore = config_term_percore(&evsel->config_terms);
		}

		return evsel ? 0 : -ENOMEM;
		return 0;
		}

		int parse_events_multi_pmu_add(struct parse_events_state *parse_state,

Admin message