From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752176AbdA3FYC (ORCPT ); Mon, 30 Jan 2017 00:24:02 -0500 Received: from mail-pg0-f68.google.com ([74.125.83.68]:34765 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751913AbdA3FXt (ORCPT ); Mon, 30 Jan 2017 00:23:49 -0500 From: Taeung Song To: Arnaldo Carvalho de Melo Cc: linux-kernel@vger.kernel.org, Jiri Olsa , Namhyung Kim , Ingo Molnar , Peter Zijlstra , Wang Nan , Taeung Song , Jiri Olsa Subject: [PATCH 2/2] perf evsel: Check for NULL before perf_evsel__is_bpf_output() Date: Mon, 30 Jan 2017 14:23:39 +0900 Message-Id: <1485753819-12857-2-git-send-email-treeze.taeung@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1485753819-12857-1-git-send-email-treeze.taeung@gmail.com> References: <1485753819-12857-1-git-send-email-treeze.taeung@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If 'evsel' is NULL, in perf_evsel__is_bpf_output() NULL pointer error can happen so check it. Cc: Jiri Olsa Cc: Namhyung Kim Signed-off-by: Taeung Song --- tools/perf/util/evsel.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 04e536a..b77da72 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -242,8 +242,10 @@ 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 | -- 2.7.4