From patchwork Thu Jul 12 09:28:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Mc Guire X-Patchwork-Id: 10521369 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 87B1F603D7 for ; Thu, 12 Jul 2018 09:34:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6851A2521E for ; Thu, 12 Jul 2018 09:34:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5C185285E1; Thu, 12 Jul 2018 09:34:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 193CD2521E for ; Thu, 12 Jul 2018 09:34:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=HURZXg18sZwF6A8qguK9LaNZ1f5oyFyTpfg64PEvZ7E=; b=l7BtkJGe3RhxfxeHfYzixEPXI7 P+OoLc8UHNkU0cZrxF1Ut90dv+fiYe5jIKEp605w3PdAI+U2uIdSgF9Lp5j3i2yYHetAsHVhdLKuI d8sQF42rm5voHYGcbnYGbdrf0BPhvySkSQpM5SPMAC3vosvbl7RZvhpiYqF52eLJu40pCdq36gmLk j6Dg6ds/uK/FtxIgYYtdwwgcGThifIBVFDnsV/jw3qabVlULeMVQ1yFKXXjdpYakUCFcRaKqFEdlF sUEXNN7JEJLNm1Bf7aQ0tS27hcibKze0qfkOcGSbh0idLdhGwiejnZmrLjyzOINVMeeGmMffEJDgp aVE/vIUQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fdXzB-0005XZ-HK; Thu, 12 Jul 2018 09:34:05 +0000 Received: from www.osadl.org ([62.245.132.105]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fdXyu-000532-JL for linux-arm-kernel@lists.infradead.org; Thu, 12 Jul 2018 09:33:51 +0000 Received: from debian01.hofrr.at (178.115.242.59.static.drei.at [178.115.242.59] (may be forged)) by www.osadl.org (8.13.8/8.13.8/OSADL-2007092901) with ESMTP id w6C9T86K021688; Thu, 12 Jul 2018 11:29:14 +0200 From: Nicholas Mc Guire To: Wei Xu Subject: [PATCH 1/3] ARM: hisi: fix error handling and missing of_node_put Date: Thu, 12 Jul 2018 11:28:22 +0200 Message-Id: <1531387704-13265-2-git-send-email-hofrat@osadl.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1531387704-13265-1-git-send-email-hofrat@osadl.org> References: <1531387704-13265-1-git-send-email-hofrat@osadl.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180712_023349_341411_335130AB X-CRM114-Status: UNSURE ( 9.67 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Wang Long , Nicholas Mc Guire , linux-kernel@vger.kernel.org, Russell King , Haifeng Yan , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP of_iomap() can return NULL which seems critical here and thus should be explicitly flagged so that the cause of system halting can be understood. As of_find_compatible_node() is returning a device node with refcount incremented it must be explicitly decremented here. Signed-off-by: Nicholas Mc Guire Fixes: commit 7fda91e73155 ("ARM: hisi: enable smp for HiP01") --- Problem located by experimental coccinelle script Patch was compile tested with: hisi_defconfig (implies CONFIG_SMP=y) There are two change related checkpatch warnings about "WARNING: Avoid crashing the kernel - try using WARN_ON" but here the BUG_ON() seems adequate. Patch is against 4.18-rc3 (localversion-next is next-20180712) arch/arm/mach-hisi/hotplug.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-hisi/hotplug.c b/arch/arm/mach-hisi/hotplug.c index a129aae..3b0d1c6 100644 --- a/arch/arm/mach-hisi/hotplug.c +++ b/arch/arm/mach-hisi/hotplug.c @@ -219,10 +219,10 @@ void hip01_set_cpu(int cpu, bool enable) if (!ctrl_base) { np = of_find_compatible_node(NULL, NULL, "hisilicon,hip01-sysctrl"); - if (np) - ctrl_base = of_iomap(np, 0); - else - BUG(); + BUG_ON(!np); + ctrl_base = of_iomap(np, 0); + of_node_put(np); + BUG_ON(!ctrl_base); } if (enable) {