From: Wen Yang <wen.yang99@zte.com.cn> To: linux-kernel@vger.kernel.org Cc: wang.yi59@zte.com.cn, Wen Yang <wen.yang99@zte.com.cn>, Russell King <linux@armlinux.org.uk>, Heiko Stuebner <heiko@sntech.de>, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org Subject: [PATCH v2 07/15] ARM: rockchip: fix a leaked reference by adding missing of_node_put Date: Tue, 5 Mar 2019 19:33:58 +0800 [thread overview] Message-ID: <1551785646-46173-7-git-send-email-wen.yang99@zte.com.cn> (raw) In-Reply-To: <1551785646-46173-1-git-send-email-wen.yang99@zte.com.cn> 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 <wen.yang99@zte.com.cn> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Cc: Russell King <linux@armlinux.org.uk> Cc: Heiko Stuebner <heiko@sntech.de> 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/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 = { -- 2.9.5
WARNING: multiple messages have this Message-ID (diff)
From: Wen Yang <wen.yang99@zte.com.cn> To: linux-kernel@vger.kernel.org Cc: wang.yi59@zte.com.cn, Heiko Stuebner <heiko@sntech.de>, Russell King <linux@armlinux.org.uk>, linux-rockchip@lists.infradead.org, Wen Yang <wen.yang99@zte.com.cn>, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 07/15] ARM: rockchip: fix a leaked reference by adding missing of_node_put Date: Tue, 5 Mar 2019 19:33:58 +0800 [thread overview] Message-ID: <1551785646-46173-7-git-send-email-wen.yang99@zte.com.cn> (raw) In-Reply-To: <1551785646-46173-1-git-send-email-wen.yang99@zte.com.cn> 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 <wen.yang99@zte.com.cn> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Cc: Russell King <linux@armlinux.org.uk> Cc: Heiko Stuebner <heiko@sntech.de> 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/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 = { -- 2.9.5 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-03-05 11:34 UTC|newest] Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-03-05 11:33 [PATCH v2 01/15] ARM: actions: fix a leaked reference by adding missing of_node_put Wen Yang 2019-03-05 11:33 ` Wen Yang 2019-03-05 11:33 ` [PATCH v2 02/15] ARM: bcm: " Wen Yang 2019-03-05 11:33 ` Wen Yang 2019-03-05 17:24 ` Ray Jui 2019-03-05 17:24 ` Ray Jui 2019-03-08 18:50 ` Florian Fainelli 2019-03-08 18:50 ` Florian Fainelli 2019-03-05 11:33 ` [PATCH v2 03/15] ARM: exynos: " Wen Yang 2019-03-05 11:33 ` Wen Yang 2019-03-05 11:33 ` Wen Yang 2019-03-19 20:39 ` Krzysztof Kozlowski 2019-03-19 20:39 ` Krzysztof Kozlowski 2019-03-05 11:33 ` [PATCH v2 04/15] ARM: hisi: " Wen Yang 2019-03-05 11:33 ` Wen Yang 2019-04-05 11:26 ` Markus Elfring 2019-04-05 11:26 ` Markus Elfring 2019-03-05 11:33 ` [PATCH v2 05/15] ARM: imx51: " Wen Yang 2019-03-05 11:33 ` Wen Yang 2019-03-06 2:58 ` Shawn Guo 2019-03-06 2:58 ` Shawn Guo 2019-03-05 11:33 ` [PATCH v2 06/15] arm: npcm: " Wen Yang 2019-03-05 11:33 ` Wen Yang 2019-03-06 12:02 ` Avi Fishman 2019-03-06 12:02 ` Avi Fishman 2019-03-06 12:02 ` Avi Fishman 2019-03-05 11:33 ` Wen Yang [this message] 2019-03-05 11:33 ` [PATCH v2 07/15] ARM: rockchip: " Wen Yang 2019-04-23 17:48 ` Heiko Stuebner 2019-04-23 17:48 ` Heiko Stuebner 2019-03-05 11:33 ` [PATCH v2 08/15] ARM: shmobile: " Wen Yang 2019-03-05 11:33 ` Wen Yang 2019-03-08 12:07 ` Simon Horman 2019-03-08 12:07 ` Simon Horman 2019-03-05 11:34 ` [PATCH v2 09/15] ARM: socfpga: " Wen Yang 2019-03-05 11:34 ` Wen Yang 2019-03-05 11:34 ` [PATCH v2 10/15] ARM: sunxi: " Wen Yang 2019-03-05 11:34 ` Wen Yang 2019-03-05 11:59 ` maxime.ripard 2019-03-05 11:59 ` maxime.ripard 2019-03-05 11:34 ` [PATCH v2 11/15] ARM: versatile: " Wen Yang 2019-03-05 11:34 ` Wen Yang 2019-03-05 11:34 ` [PATCH v2 12/15] ARM: vexpress: " Wen Yang 2019-03-05 11:34 ` Wen Yang 2019-03-05 11:39 ` Sudeep Holla 2019-03-05 11:39 ` Sudeep Holla 2019-03-05 11:34 ` [PATCH v2 13/15] ARM: zynq: " Wen Yang 2019-03-05 11:34 ` Wen Yang 2019-03-05 11:34 ` [PATCH v2 14/15] arm64: cpu_ops: " Wen Yang 2019-03-05 11:34 ` Wen Yang 2019-04-01 15:37 ` Will Deacon 2019-04-01 15:37 ` Will Deacon [not found] ` <201904031356099956278@zte.com.cn> 2019-04-03 12:44 ` 答复: Re: [PATCH v2 14/15] arm64: cpu_ops: fix a leaked reference byadding " Will Deacon 2019-04-03 12:44 ` Will Deacon 2019-03-05 11:34 ` [PATCH v2 15/15] ARM: axxia: fix a leaked reference by adding " Wen Yang 2019-03-05 11:34 ` Wen Yang 2019-03-05 11:40 ` [PATCH v2 01/15] ARM: actions: " Russell King - ARM Linux admin 2019-03-05 11:40 ` Russell King - ARM Linux admin 2019-03-09 2:17 ` Manivannan Sadhasivam 2019-03-09 2:17 ` Manivannan Sadhasivam 2019-03-09 8:14 ` Russell King - ARM Linux admin 2019-03-09 8:14 ` Russell King - ARM Linux admin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1551785646-46173-7-git-send-email-wen.yang99@zte.com.cn \ --to=wen.yang99@zte.com.cn \ --cc=heiko@sntech.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-rockchip@lists.infradead.org \ --cc=linux@armlinux.org.uk \ --cc=wang.yi59@zte.com.cn \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.