Commit-ID: de3d0f12be476271d03f1ddb5a7c241c2f07f126 Gitweb: https://git.kernel.org/tip/de3d0f12be476271d03f1ddb5a7c241c2f07f126 Author: Ganapatrao Kulkarni <ganapatrao.kulka...@cavium.com> AuthorDate: Tue, 17 Oct 2017 00:02:22 +0530 Committer: Arnaldo Carvalho de Melo <a...@redhat.com> 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 <ganapatrao.kulka...@cavium.com> Cc: Alexander Shishkin <alexander.shish...@linux.intel.com> Cc: Catalin Marinas <catalin.mari...@arm.com> Cc: Ganapatrao Kulkarni <gklkm...@gmail.com> Cc: Jayachandran C <jn...@caviumnetworks.com> Cc: Jonathan Cameron <jonathan.came...@huawei.com> Cc: Mark Rutland <mark.rutl...@arm.com> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Robert Richter <robert.rich...@cavium.com> Cc: Shaokun Zhang <zhangshao...@hisilicon.com> Cc: Will Deacon <will.dea...@arm.com> Cc: linux-arm-ker...@lists.infradead.org Link: http://lkml.kernel.org/r/20171016183222.25750-6-ganapatrao.kulka...@cavium.com Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> --- 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++];
