Commit-ID: fd8d2702791a970c751f8b526a17d8e725a05b46
Gitweb: https://git.kernel.org/tip/fd8d2702791a970c751f8b526a17d8e725a05b46
Author: Hisao Tanabe <xtan...@gmail.com>
AuthorDate: Sat, 25 Aug 2018 00:45:56 +0900
Committer: Arnaldo Carvalho de Melo <a...@redhat.com>
CommitDate: Thu, 30 Aug 2018 14:49:25 -0300
perf evsel: Fix potential null pointer dereference in perf_evsel__new_idx()
If evsel is NULL, we should return NULL to avoid a NULL pointer
dereference a bit later in the code.
Signed-off-by: Hisao Tanabe <xtan...@gmail.com>
Acked-by: Namhyung Kim <namhy...@kernel.org>
Cc: Jiri Olsa <jo...@redhat.com>
Cc: Wang Nan <wangn...@huawei.com>
Fixes: 03e0a7df3efd ("perf tools: Introduce bpf-output event")
LPU-Reference: 20180824154556.23428-1-xtan...@gmail.com
Link: https://lkml.kernel.org/n/tip-e5plzjhx6595a5yjaf22j...@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com>
---
tools/perf/util/evsel.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index c980bbff6353..1a61628a1c12 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -251,8 +251,9 @@ struct perf_evsel *perf_evsel__new_idx(struct
perf_event_attr *attr, int idx)
{
struct perf_evsel *evsel = zalloc(perf_evsel__object.size);
- if (evsel != NULL)
- perf_evsel__init(evsel, attr, idx);
+ if (!evsel)
+ return NULL;
+ perf_evsel__init(evsel, attr, idx);
if (perf_evsel__is_bpf_output(evsel)) {
evsel->attr.sample_type |= (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME |
