From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5632EC2BAEE for ; Tue, 24 Mar 2020 13:33:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2569E20870 for ; Tue, 24 Mar 2020 13:33:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585056784; bh=jM7Fews3e1MESegyezgjrz7anoNSo3IuYP4oG7HKigc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0zte9/O2s+hkm/bnLgdOJpD/v4/iVYuLvWg3FLPkT7s4Iptiq+LjbmZU8es+eBEfw GTT5R1CN+NIl+XJ+GGSkkJe0vAj5IMFaykgKXKC/ZRrQw1bPHTUUGbsITp+Nl34vD+ 3UxoyRKDLSLFW0HLqDZ2C2/kYxEVBwke3FmU77FI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727811AbgCXNP5 (ORCPT ); Tue, 24 Mar 2020 09:15:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:35060 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727935AbgCXNPz (ORCPT ); Tue, 24 Mar 2020 09:15:55 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B2C1A20775; Tue, 24 Mar 2020 13:15:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585055755; bh=jM7Fews3e1MESegyezgjrz7anoNSo3IuYP4oG7HKigc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M/NE2upK2j/DUAw77QvVMG5Uq/FCz2bfbwrnwTvBdNllPm3gv8eXayM8Bzonlhox4 IN+5HSyycjd0hBkzvM2RgOe5xiaJxfx/KVDgW7ycSSB/buexYNbdPRDrG+Tr8dRpYg 7qTKlLJ6uOHu/IvZQ7sGR2T3r7pRMv1oUbHuPB+k= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Liguang Zhang , Will Deacon , Sasha Levin Subject: [PATCH 5.4 019/102] drivers/perf: arm_pmu_acpi: Fix incorrect checking of gicc pointer Date: Tue, 24 Mar 2020 14:10:11 +0100 Message-Id: <20200324130808.480470228@linuxfoundation.org> X-Mailer: git-send-email 2.25.2 In-Reply-To: <20200324130806.544601211@linuxfoundation.org> References: <20200324130806.544601211@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: luanshi [ Upstream commit 3ba52ad55b533760a1f65836aa0ec9d35e36bb4f ] Fix bogus NULL checks on the return value of acpi_cpu_get_madt_gicc() by checking for a 0 'gicc->performance_interrupt' value instead. Signed-off-by: Liguang Zhang Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- drivers/perf/arm_pmu_acpi.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/perf/arm_pmu_acpi.c b/drivers/perf/arm_pmu_acpi.c index acce8781c456c..f5c7a845cd7bf 100644 --- a/drivers/perf/arm_pmu_acpi.c +++ b/drivers/perf/arm_pmu_acpi.c @@ -24,8 +24,6 @@ static int arm_pmu_acpi_register_irq(int cpu) int gsi, trigger; gicc = acpi_cpu_get_madt_gicc(cpu); - if (WARN_ON(!gicc)) - return -EINVAL; gsi = gicc->performance_interrupt; @@ -64,11 +62,10 @@ static void arm_pmu_acpi_unregister_irq(int cpu) int gsi; gicc = acpi_cpu_get_madt_gicc(cpu); - if (!gicc) - return; gsi = gicc->performance_interrupt; - acpi_unregister_gsi(gsi); + if (gsi) + acpi_unregister_gsi(gsi); } #if IS_ENABLED(CONFIG_ARM_SPE_PMU) -- 2.20.1