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=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 47E72C10F03 for ; Tue, 23 Apr 2019 17:49:10 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 185CC214AE for ; Tue, 23 Apr 2019 17:49:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Tdgz9ctK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 185CC214AE Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=sntech.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=XD3IZlMluQ/Pni1A56amD2+x2gfZn4HbVOQRub0d5Ys=; b=Tdgz9ctKFA17Yd cqKX6SU2Ce9G/gYqA1j3SrrNjptmrKztWvH8JGUrVjrc+FRJGUFSNLC94CP78kGF0TENuIzFdd0vJ vyq0l+Doggu6glKi1G6pWaFgPCOK3/IEaDi3VJGSohGXprwN+DFb5/dyqytZ0l0ozshKl517JK6PG r+JbNkqwATprdEj5OjjEsRP8qwl9t6CjwlU+lcNYBj3XYlazIb45fR120HNGUokkY4tztS2PCNfm+ VoxR1nayZSpyeCJEeJ/0P63RNMZDpCnoIQGEpFNh0awRCJ1VdDc0HlK+ON1cqggx9W3vWMvxp8PQT TeLA2NswGUgfiGFvSyrQ==; 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 1hIzXZ-00081I-Gk; Tue, 23 Apr 2019 17:49:09 +0000 Received: from gloria.sntech.de ([185.11.138.130]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hIzXV-00080h-Oi; Tue, 23 Apr 2019 17:49:07 +0000 Received: from p57b772a1.dip0.t-ipconnect.de ([87.183.114.161] helo=phil.localnet) by gloria.sntech.de with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hIzXK-0003tk-BP; Tue, 23 Apr 2019 19:48:54 +0200 From: Heiko Stuebner To: Wen Yang Subject: Re: [PATCH v2 07/15] ARM: rockchip: fix a leaked reference by adding missing of_node_put Date: Tue, 23 Apr 2019 19:48:53 +0200 Message-ID: <1645207.xa1a3A0MYx@phil> In-Reply-To: <1551785646-46173-7-git-send-email-wen.yang99@zte.com.cn> References: <1551785646-46173-1-git-send-email-wen.yang99@zte.com.cn> <1551785646-46173-7-git-send-email-wen.yang99@zte.com.cn> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190423_104905_957034_F71D1091 X-CRM114-Status: GOOD ( 22.62 ) 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.yi59@zte.com.cn, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Russell King Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi, sorry that this took so long to look at, but I think it needs a bit of rework, see below: Am Dienstag, 5. M=E4rz 2019, 12:33:58 CEST schrieb Wen Yang: > 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; acquir= ed a node pointer with refcount incremented on line 259, but without a corr= esponding object release within this function. > ./arch/arm/mach-rockchip/pm.c:275:2-8: ERROR: missing of_node_put; acquir= ed a node pointer with refcount incremented on line 259, but without a corr= esponding object release within this function > ./arch/arm/mach-rockchip/platsmp.c:280:2-8: ERROR: missing of_node_put; a= cquired 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; a= cquired 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; a= cquired 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; a= cquired 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; a= cquired 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; a= cquired 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; a= cquired a node pointer with refcount incremented on line 241, but without a= corresponding object release within this function. > = > Signed-off-by: Wen Yang > Reviewed-by: Florian Fainelli > 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 > --- > v2->v1: add a missing space between "adding" and "missing" > = > 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/pl= atsmp.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(unsign= ed int max_cpus) > sram_base_addr =3D of_iomap(node, 0); just do the of_node_put here and drop the whole error gotos? Because node in this case only holds the possible pointer to = > 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() =3D=3D 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 =3D 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 =3D of_iomap(node, 0); similarly just put the scu node here? > 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 =3D 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 =3D of_iomap(sram_np, 0); > if (!rk3288_bootram_base) { > pr_err("%s: could not map bootram base\n", __func__); just add a regular of_node_put here? > - return -ENOMEM; > + ret =3D -ENOMEM; > + goto out_put_node; > } > = > ret =3D of_address_to_resource(sram_np, 0, &res); > if (ret) { > pr_err("%s: could not get bootram phy addr\n", __func__); and here as well? Not having to follow gotos might improve readability especially as after here the node isn't used anymore as indicated by the already existing of_node_put below which should be kept. Heiko > - return ret; > + goto out_put_node; > } > rk3288_bootram_phy =3D 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 =3D { > = _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel