From patchwork Fri Mar 1 08:56:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Yang X-Patchwork-Id: 10834779 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A37DF17E9 for ; Fri, 1 Mar 2019 08:59:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8AEBD2DE1A for ; Fri, 1 Mar 2019 08:59:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7C2FD2DE28; Fri, 1 Mar 2019 08:59:05 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable 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 0B9732DE1A for ; Fri, 1 Mar 2019 08:59:05 +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=033SX4qczzlwd/i70Vbt2ErSB7DE+UmO/TAmcdpgk0g=; b=QhBzhPdYyYTDR37OG4gMmpwO0f XDdDIOa/Pdcs3uPWv865DPIca9WmOArQMvrNjn4z86IbcyyTTu5fWTc06LCrgZFQ632Wc+DXRwlvI ZPsyaILby0jAsAr9svYDlETMzfcO81ndjwxu6uh4vV3o4THtLePwruHe75rgjcl8ViQoP28Yq0fW8 Tp9tjjeUiTyNSLoCwFagiY8H1EPpOUuuvg8i78InSDIASLhTqmfhB+312VLA/J3qzBfFOTfl+Wupv sdq3/CGBv/wyN77SeBaRNKIRfL/DjyMujRJ13LsXNBVA8j/YQgoibGwsPT7AJx5DsZMF4ZMxhPq+o gGE76odQ==; 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 1gze0S-0002xt-Ee; Fri, 01 Mar 2019 08:59:00 +0000 Received: from out1.zte.com.cn ([202.103.147.172] helo=mxct.zte.com.cn) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gzdzK-0001C8-Cz; Fri, 01 Mar 2019 08:58:23 +0000 Received: from mse01.zte.com.cn (unknown [10.30.3.20]) by Forcepoint Email with ESMTPS id CC1E3FB4494B3BFFA1CA; Fri, 1 Mar 2019 16:57:16 +0800 (CST) Received: from notes_smtp.zte.com.cn ([10.30.1.239]) by mse01.zte.com.cn with ESMTP id x218v7wO086910; Fri, 1 Mar 2019 16:57:07 +0800 (GMT-8) (envelope-from wen.yang99@zte.com.cn) Received: from fox-host8.localdomain ([10.74.120.8]) by szsmtp06.zte.com.cn (Lotus Domino Release 8.5.3FP6) with ESMTP id 2019030116574621-2498999 ; Fri, 1 Mar 2019 16:57:46 +0800 From: Wen Yang To: liviu.dudau@arm.com Subject: [PATCH 07/15] ARM: rockchip: fix a leaked reference by addingmissing of_node_put Date: Fri, 1 Mar 2019 16:56:48 +0800 Message-Id: <1551430616-42014-7-git-send-email-wen.yang99@zte.com.cn> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1551430616-42014-1-git-send-email-wen.yang99@zte.com.cn> References: <1551430616-42014-1-git-send-email-wen.yang99@zte.com.cn> X-MIMETrack: Itemize by SMTP Server on SZSMTP06/server/zte_ltd(Release 8.5.3FP6|November 21, 2013) at 2019-03-01 16:57:46, Serialize by Router on notes_smtp/zte_ltd(Release 9.0.1FP7|August 17, 2016) at 2019-03-01 16:56:52, Serialize complete at 2019-03-01 16:56:52 X-MAIL: mse01.zte.com.cn x218v7wO086910 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190301_005751_059881_3F75DEAF X-CRM114-Status: GOOD ( 15.91 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: heiko@sntech.de, maxime.ripard@bootlin.com, catalin.marinas@arm.com, linus.walleij@linaro.org, brendanhiggins@google.com, michal.simek@xilinx.com, xuwei5@hisilicon.com, manivannan.sadhasivam@linaro.org, Wen Yang , tmaimon77@gmail.com, f.fainelli@gmail.com, linux-rockchip@lists.infradead.org, will.deacon@arm.com, openbmc@lists.ozlabs.org, magnus.damm@gmail.com, linux@armlinux.org.uk, krzk@kernel.org, linux-samsung-soc@vger.kernel.org, wens@csie.org, kgene@kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-imx@nxp.com, wang.yi59@zte.com.cn, rjui@broadcom.com, s.hauer@pengutronix.de, lorenzo.pieralisi@arm.com, yuenn@google.com, linux-arm-kernel@lists.infradead.org, sbranden@broadcom.com, avifishman70@gmail.com, venture@google.com, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, dinguyen@kernel.org, horms@verge.net.au, kernel@pengutronix.de, sudeep.holla@arm.com, fabio.estevam@nxp.com, shawnguo@kernel.org, afaerber@suse.de MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The call to of_get_next_child returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage. Detected by coccinelle with the following warnings: ./arch/arm/mach-rockchip/pm.c:269:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 259, but without a corresponding object release within this function. ./arch/arm/mach-rockchip/pm.c:275:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 259, but without a corresponding object release within this function ./arch/arm/mach-rockchip/platsmp.c:280:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 271, but without a corresponding object release within this function. ./arch/arm/mach-rockchip/platsmp.c:284:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 271, but without a corresponding object release within this function. ./arch/arm/mach-rockchip/platsmp.c:288:3-9: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 271, but without a corresponding object release within this function. ./arch/arm/mach-rockchip/platsmp.c:302:3-9: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 293, but without a corresponding object release within this function. ./arch/arm/mach-rockchip/platsmp.c:250:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 241, but without a corresponding object release within this function. ./arch/arm/mach-rockchip/platsmp.c:260:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 241, but without a corresponding object release within this function. ./arch/arm/mach-rockchip/platsmp.c:263:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 241, but without a corresponding object release within this function. Signed-off-by: Wen Yang Cc: Russell King Cc: Heiko Stuebner Cc: linux-arm-kernel@lists.infradead.org Cc: linux-rockchip@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- arch/arm/mach-rockchip/platsmp.c | 12 ++++++++---- arch/arm/mach-rockchip/pm.c | 11 ++++++----- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/arch/arm/mach-rockchip/platsmp.c b/arch/arm/mach-rockchip/platsmp.c index 51984a4..f93d64e 100644 --- a/arch/arm/mach-rockchip/platsmp.c +++ b/arch/arm/mach-rockchip/platsmp.c @@ -277,19 +277,20 @@ static void __init rockchip_smp_prepare_cpus(unsigned int max_cpus) sram_base_addr = of_iomap(node, 0); if (!sram_base_addr) { pr_err("%s: could not map sram registers\n", __func__); - return; + goto out_put_node; } if (has_pmu && rockchip_smp_prepare_pmu()) - return; + goto out_put_node; if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9) { if (rockchip_smp_prepare_sram(node)) - return; + goto out_put_node; /* enable the SCU power domain */ pmu_set_power_domain(PMU_PWRDN_SCU, true); + of_node_put(node); node = of_find_compatible_node(NULL, NULL, "arm,cortex-a9-scu"); if (!node) { pr_err("%s: missing scu\n", __func__); @@ -299,7 +300,7 @@ static void __init rockchip_smp_prepare_cpus(unsigned int max_cpus) scu_base_addr = of_iomap(node, 0); if (!scu_base_addr) { pr_err("%s: could not map scu registers\n", __func__); - return; + goto out_put_node; } /* @@ -321,6 +322,9 @@ static void __init rockchip_smp_prepare_cpus(unsigned int max_cpus) /* Make sure that all cores except the first are really off */ for (i = 1; i < ncores; i++) pmu_set_power_domain(0 + i, false); + +out_put_node: + of_node_put(node); } static void __init rk3036_smp_prepare_cpus(unsigned int max_cpus) diff --git a/arch/arm/mach-rockchip/pm.c b/arch/arm/mach-rockchip/pm.c index 0592534..43a16c9 100644 --- a/arch/arm/mach-rockchip/pm.c +++ b/arch/arm/mach-rockchip/pm.c @@ -266,25 +266,26 @@ static int rk3288_suspend_init(struct device_node *np) rk3288_bootram_base = of_iomap(sram_np, 0); if (!rk3288_bootram_base) { pr_err("%s: could not map bootram base\n", __func__); - return -ENOMEM; + ret = -ENOMEM; + goto out_put_node; } ret = of_address_to_resource(sram_np, 0, &res); if (ret) { pr_err("%s: could not get bootram phy addr\n", __func__); - return ret; + goto out_put_node; } rk3288_bootram_phy = res.start; - of_node_put(sram_np); - rk3288_config_bootdata(); /* copy resume code and data to bootsram */ memcpy(rk3288_bootram_base, rockchip_slp_cpu_resume, rk3288_bootram_sz); - return 0; +out_put_node: + of_node_put(sram_np); + return ret; } static const struct platform_suspend_ops rk3288_suspend_ops = {