perf inject: The tool->read() call may pass a NULL evsel, handle it
authorArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 3 Jul 2019 19:02:09 +0000 (16:02 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 9 Jul 2019 12:33:55 +0000 (09:33 -0300)
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>
tools/perf/builtin-inject.c

index 8e0e06d3edfc40138e1ad1053632f2b80f5ed5ab..f4591a1438b47479cc14882d983d22e0ca4634fd 100644 (file)
@@ -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);
        }