Commit 40978e9b authored Jul 03, 2019 by Arnaldo Carvalho de Melo

perf inject: The tool->read() call may pass a NULL evsel, handle it

Check first, as machines__deliver_event() may have
perf_evlist__id2evsel() returning NULL.

This was found while checking a report from Leo Yan that used the smatch
tool to find places where a pointer is checked before use and then,
later in the same function gets used without checking.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-muvb8xqyh0gysgfjfq35w642@git.kernel.org

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

parent 363bbaef

tools/perf/builtin-inject.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -224,7 +224,7 @@ static int perf_event__repipe_sample(struct perf_tool *tool,
		struct perf_evsel *evsel,
		struct machine *machine)
		{
		if (evsel->handler) {
		if (evsel && evsel->handler) {
		inject_handler f = evsel->handler;
		return f(tool, event, sample, evsel, machine);
		}

Admin message