path: root/tools
diff options
authorArnaldo Carvalho de Melo <acme@redhat.com>2019-06-17 14:32:53 -0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2019-06-17 15:57:20 -0300
commitfdbdd7e8580eac9bdafa532746c865644d125e34 (patch)
tree4741ddbc5f3a588f9743348aa0a612cfca2d3cc2 /tools
parent016f327ce48f9b0b1cdea729ba7080596113563f (diff)
perf evsel: Make perf_evsel__name() accept a NULL argument
In which case it simply returns "unknown", like when it can't figure out the evsel->name value. This makes this code more robust and fixes a problem in 'perf trace' where a NULL evsel was being passed to a routine that only used the evsel for printing its name when a invalid syscall id was passed. Reported-by: Leo Yan <leo.yan@linaro.org> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Link: https://lkml.kernel.org/n/tip-f30ztaasku3z935cn3ak3h53@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 0f506f10ecf0..04c4ed1573cb 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -589,6 +589,9 @@ const char *perf_evsel__name(struct perf_evsel *evsel)
char bf[128];
+ if (!evsel)
+ goto out_unknown;
if (evsel->name)
return evsel->name;
@@ -628,7 +631,10 @@ const char *perf_evsel__name(struct perf_evsel *evsel)
evsel->name = strdup(bf);
- return evsel->name ?: "unknown";
+ if (evsel->name)
+ return evsel->name;
+ return "unknown";
const char *perf_evsel__group_name(struct perf_evsel *evsel)