From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752642AbdLFQof (ORCPT ); Wed, 6 Dec 2017 11:44:35 -0500 Received: from terminus.zytor.com ([65.50.211.136]:45247 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752255AbdLFQoP (ORCPT ); Wed, 6 Dec 2017 11:44:15 -0500 Date: Wed, 6 Dec 2017 08:40:20 -0800 From: tip-bot for Ganapatrao Kulkarni Message-ID: Cc: gklkml16@gmail.com, mark.rutland@arm.com, zhangshaokun@hisilicon.com, hpa@zytor.com, acme@redhat.com, linux-kernel@vger.kernel.org, jonathan.cameron@huawei.com, catalin.marinas@arm.com, tglx@linutronix.de, robert.richter@cavium.com, will.deacon@arm.com, jnair@caviumnetworks.com, ganapatrao.kulkarni@cavium.com, mingo@kernel.org, peterz@infradead.org, alexander.shishkin@linux.intel.com Reply-To: gklkml16@gmail.com, mark.rutland@arm.com, zhangshaokun@hisilicon.com, hpa@zytor.com, jonathan.cameron@huawei.com, acme@redhat.com, linux-kernel@vger.kernel.org, catalin.marinas@arm.com, tglx@linutronix.de, robert.richter@cavium.com, will.deacon@arm.com, jnair@caviumnetworks.com, ganapatrao.kulkarni@cavium.com, mingo@kernel.org, peterz@infradead.org, alexander.shishkin@linux.intel.com In-Reply-To: <20171016183222.25750-6-ganapatrao.kulkarni@cavium.com> References: <20171016183222.25750-6-ganapatrao.kulkarni@cavium.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf pmu: Add check for valid cpuid in perf_pmu__find_map() Git-Commit-ID: de3d0f12be476271d03f1ddb5a7c241c2f07f126 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: de3d0f12be476271d03f1ddb5a7c241c2f07f126 Gitweb: https://git.kernel.org/tip/de3d0f12be476271d03f1ddb5a7c241c2f07f126 Author: Ganapatrao Kulkarni AuthorDate: Tue, 17 Oct 2017 00:02:22 +0530 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 5 Dec 2017 15:43:51 -0300 perf pmu: Add check for valid cpuid in perf_pmu__find_map() On some platforms(arm/arm64) which uses cpus map to get corresponding cpuid string, cpuid can be NULL for PMUs other than CORE PMUs. Adding check for NULL cpuid in function perf_pmu__find_map to avoid segmentation fault. Signed-off-by: Ganapatrao Kulkarni Cc: Alexander Shishkin Cc: Catalin Marinas Cc: Ganapatrao Kulkarni Cc: Jayachandran C Cc: Jonathan Cameron Cc: Mark Rutland Cc: Peter Zijlstra Cc: Robert Richter Cc: Shaokun Zhang Cc: Will Deacon Cc: linux-arm-kernel@lists.infradead.org Link: http://lkml.kernel.org/r/20171016183222.25750-6-ganapatrao.kulkarni@cavium.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/pmu.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 732ff57..8b7c151 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -601,6 +601,12 @@ struct pmu_events_map *perf_pmu__find_map(struct perf_pmu *pmu) char *cpuid = perf_pmu__getcpuid(pmu); int i; + /* on some platforms which uses cpus map, cpuid can be NULL for + * PMUs other than CORE PMUs. + */ + if (!cpuid) + return NULL; + i = 0; for (;;) { map = &pmu_events_map[i++];