From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759075AbcIACSc (ORCPT ); Wed, 31 Aug 2016 22:18:32 -0400 Received: from mail-pf0-f177.google.com ([209.85.192.177]:33503 "EHLO mail-pf0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753885AbcIACSa (ORCPT ); Wed, 31 Aug 2016 22:18:30 -0400 From: Kevin Hilman To: Will Deacon Cc: Stefan Wahren , Mark Rutland , Eric Anholt , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, marc.zyngier@arm.com Subject: Re: [PATCH 2/2] drivers/perf: arm_pmu: Fix NULL pointer dereference during probe Organization: BayLibre References: <1472314790-4268-1-git-send-email-stefan.wahren@i2se.com> <1472314790-4268-2-git-send-email-stefan.wahren@i2se.com> <20160830112718.GC24906@arm.com> Date: Wed, 31 Aug 2016 19:17:51 -0700 In-Reply-To: <20160830112718.GC24906@arm.com> (Will Deacon's message of "Tue, 30 Aug 2016 12:27:19 +0100") Message-ID: <7h37lk4b3k.fsf@baylibre.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Will Deacon writes: > On Sat, Aug 27, 2016 at 04:19:50PM +0000, Stefan Wahren wrote: >> 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(-) > > Thanks, these two look good to me. I'll queue them up as fixes and hopefully > they'll land in -rc5. FWIW, I tested this on bcm2835-rpi and verified it fixes the boot problem in mainline. Tested-by: Kevin Hilman Kevin