wonderful-mobile/exynos-linux-stable
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

perf evsel: Make perf_evsel__name() accept a NULL argument

Browse source 
[ Upstream commit fdbdd7e8580eac9bdafa532746c865644d125e34 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Arnaldo Carvalho de Melo 2019-06-17 14:32:53 -03:00 • committed by Greg Kroah-Hartman
parent 2d0dbd001b
commit 0ee3341eb3
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tools/perf/util/evsel.c
View file

@ -558,6 +558,9 @@ const char *perf_evsel__name(struct perf_evsel *evsel)
{ {
char bf[128]; char bf[128];
if (!evsel)
goto out_unknown;
if (evsel->name) if (evsel->name)
return evsel->name; return evsel->name;
@ -594,7 +597,10 @@ const char *perf_evsel__name(struct perf_evsel *evsel)
evsel->name = strdup(bf); evsel->name = strdup(bf);
return evsel->name ?: "unknown"; if (evsel->name)
return evsel->name;
out_unknown:
return "unknown";
} }
const char *perf_evsel__group_name(struct perf_evsel *evsel) const char *perf_evsel__group_name(struct perf_evsel *evsel)