Skip to contentSkip to conversation

soc: ti: pm33xx: Fix refcount leak in am33xx_pm_rtc_setup

PATCH In review Miaoqian Lin 2 participants 2 messages May 16, 2022 – Jun 18, 2022 TI Keystone multicore navigator drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 soc: ti: pm33xx: Fix refcount leak in am33xx_pm_rtc_setup

of_find_node_by_name() returns a node pointer with refcount incremented, we should use of_node_put() on it when done. Add missing of_node_put() to avoid refcount leak.

Fixes 5a99ae0092fe ("soc: ti: pm33xx: AM437X: Add rtc_only with ddr in self-refresh support")
---
 drivers/soc/ti/pm33xx.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/soc/ti/pm33xx.c +7 -3
index 7bab4bbaf02d..b4d6e6ad85f4 100644
@@ -445,8 +445,10 @@ static int am33xx_pm_rtc_setup(void)
 	if (of_device_is_available(np)) {
 		/* RTC interconnect target module clock */
 		rtc_fck = of_clk_get_by_name(np->parent, "fck");
-		if (IS_ERR(rtc_fck))
-			return PTR_ERR(rtc_fck);
+		if (IS_ERR(rtc_fck)) {
+			error = PTR_ERR(rtc_fck);
+			goto err_node_put;
+		}
 
 		rtc_base_virt = of_iomap(np, 0);
 		if (!rtc_base_virt) {
@@ -479,6 +481,7 @@ static int am33xx_pm_rtc_setup(void)
 	} else {
 		pr_warn("PM: no-rtc available, rtc-only mode disabled.\n");
 	}
+	of_node_put(np);
 
 	return 0;
 
@@ -486,7 +489,8 @@ static int am33xx_pm_rtc_setup(void)
 	iounmap(rtc_base_virt);
 err_clk_put:
 	clk_put(rtc_fck);
-
+err_node_put:
+	of_node_put(np);
 	return error;
 }
 
Signature · 1 line
2.25.1
maintainer
#1 lore raw
Quoted 5 lines · Miaoqian Lin

of_find_node_by_name() returns a node pointer with refcount incremented, we should use of_node_put() on it when done. Add missing of_node_put() to avoid refcount leak.

Fixes 5a99ae0092fe ("soc: ti: pm33xx: AM437X: Add rtc_only with ddr in self-refresh support")

Trouble here is that the patch wont apply directly on this commit -> So, when we pass this over to stable, it will fail for certain stable kernels, you want to explicitly list the stables on which this should apply to.

Documentation/process/stable-kernel-rules.rst and be explicit in the rules here.

[...]

Signature · 3 lines
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D