From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932225AbcH0Q2C (ORCPT ); Sat, 27 Aug 2016 12:28:02 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:51330 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754710AbcH0Q15 (ORCPT ); Sat, 27 Aug 2016 12:27:57 -0400 From: Stefan Wahren To: Mark Rutland , Will Deacon Cc: Eric Anholt , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Stefan Wahren Subject: [PATCH 2/2] drivers/perf: arm_pmu: Fix NULL pointer dereference during probe Date: Sat, 27 Aug 2016 16:19:50 +0000 Message-Id: <1472314790-4268-2-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1472314790-4268-1-git-send-email-stefan.wahren@i2se.com> References: <1472314790-4268-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V03:K0:hkQa4Duoj+cKt7oh98SD1vsIwGGExs/wcw09oCAOxGDN+XGvvDq xiVZOixxmq4p38117NoCfMXefTx/WpBE6PlrgUD5G8TOul82zfMWmp8N4xUiPl2wJ5EB7u4 JHA13BTD1WIDO4CcGH+va2dV1XFd5fM4bfP8EnhemeeVqG9MXz6CcY8EzSCGMcTPsWngTlL ri0mpfpglNzMYdU+AyCUg== X-UI-Out-Filterresults: notjunk:1;V01:K0:QjeM0N0Lv2Q=:gCOkt+F7318iSuvXSfdUTU ynBIcnl5AGYRnRpuD5eOeDaYvXKzUHG7rA9h2pQrtwK99rBU5idSDNiPnSRb0EImr3o/QD+Ok EZhjZsoIo1tMsjs5uUg/inrLHhSVnZYHfUFHr8ExW5jZicLduxAncQieZ50pwo2egzvNTNpUX 3oBQE3wHGJQC2JJD+YlJ8u06lw5vGlnbrdXHjqr/IKkPLhlFJfLfeSksyruIEO8/0Kz/Z13C1 soRaNMykgaARSpuKG+1LVM/FCWfZrrreAZAehkfhthK+oOSvmMFBceBrd43gc1DC75VD3HfIr hSCFAAMAc2IEEzr4piiJsIz1N/KqSgvFZ4jILca+ja0L/tsj5fS9Hff1Jj5au3O2FrC8E4ywF KAAUJPu4ThPRUOn78QlcvBoMu6zaOSfC26pXvhDpdqzZH5pUq055UjoTuGePPWCDnl3BblaNf UKDLm42FKAfVmjMnrLdHcenn9CZ3jXgY5DDtiBu/q63aPzKJCMTrC2y1OlGY7W2cDwymVETpR oNTI19ceYlNLLiNIdp7QuAw42LTL5AWZZxd26sfztegEX/9mpcMwwzogTZWaTg/5SDGdv51ta RI3TS6/H5xoieegRx/nQOjpz3JWkyKv3TDbli+4W+t9hbHMecQ9oqPkuQCt9jX0ejCv7t+Jdl C/Wybq1aowoVvjEh+xHp7DHrGyhAHxTAogGM8528l1Zc0jHVFt16cXanvHry9wfBp9xY= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Patch 7f1d642fbb5c ("drivers/perf: arm-pmu: Fix handling of SPI lacking interrupt-affinity property") unintended also fixes perf_event support for bcm2835 which doesn't have PMU interrupts. Unfortunately this change introduce a NULL pointer dereference on bcm2835, because irq_is_percpu always expected to be called with a valid IRQ. So fix this regression by validating the IRQ before. Signed-off-by: Stefan Wahren Fixes: 7f1d642fbb5c ("drivers/perf: arm-pmu: Fix handling of SPI lacking \"interrupt-affinity\" property") --- drivers/perf/arm_pmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Note: checkpatch.pl complains about the fixes tag, but i don't know how to escape it correctly. diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c index 1b48bf0..f5e1008 100644 --- a/drivers/perf/arm_pmu.c +++ b/drivers/perf/arm_pmu.c @@ -970,7 +970,7 @@ static int of_pmu_irq_cfg(struct arm_pmu *pmu) if (cpumask_weight(&pmu->supported_cpus) == 0) { int irq = platform_get_irq(pdev, 0); - if (irq_is_percpu(irq)) { + if (irq >= 0 && irq_is_percpu(irq)) { /* If using PPIs, check the affinity of the partition */ int ret; -- 1.7.9.5