Skip to contentSkip to conversation

sparc: Fix reference leak in scan_of_devices

PATCH New Miaoqian Lin 1 participant 3 messages Jun 7, 2022 SPARC + UltraSPARC (sparc/sparc64)

lore
Share & tools
lore
#0 lore raw

PATCH 2/3 sparc: Fix reference leak in scan_of_devices

of_find_node_by_path() returns a node pointer with refcount incremented, we should use of_node_put() on it when not need anymore.
Add missing of_node_put() to avoid refcount leak.

Fixes cf44bbc26cf1 ("[SPARC]: Beginnings of generic of_device framework.")
---
 arch/sparc/kernel/of_device_32.c | 4 +++-
 arch/sparc/kernel/of_device_64.c | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)
arch/sparc/kernel/of_device_32.c +3 -1
index 4ebf51e6e78e..020b1c023d75 100644
@@ -412,8 +412,10 @@ static int __init scan_of_devices(void)
 	struct platform_device *parent;
 
 	parent = scan_one_device(root, NULL);
-	if (!parent)
+	if (!parent) {
+		of_node_put(root);
 		return 0;
+	}
 
 	scan_tree(root->child, &parent->dev);
 	return 0;
arch/sparc/kernel/of_device_64.c +3 -1
index 5a9f86b1d4e7..f044b4c1975b 100644
@@ -705,8 +705,10 @@ static int __init scan_of_devices(void)
 	struct platform_device *parent;
 
 	parent = scan_one_device(root, NULL);
-	if (!parent)
+	if (!parent) {
+		of_node_put(root);
 		return 0;
+	}
 
 	scan_tree(root->child, &parent->dev);
 	return 0;
Signature · 1 line
2.25.1
#2 lore raw

PATCH 3/3 sparc: prom: Fix reference leak in of_console_init

of_find_node_by_path() returns a node pointer with refcount incremented, we should use of_node_put() on it when not need anymore.
Add missing of_node_put() to avoid refcount leak.

Fixes c73fcc846c91 ("[SPARC]: Fix serial console device detection.")
---
 arch/sparc/kernel/prom_32.c | 1 +
 1 file changed, 1 insertion(+)
arch/sparc/kernel/prom_32.c +1 -0
index 3df960c137f7..7fc1c2dc31d5 100644
@@ -295,6 +295,7 @@ void __init of_console_init(void)
 
 			dp = of_find_node_by_path("/");
 			path = of_get_property(dp, "stdout-path", NULL);
+			of_node_put(dp);
 			if (!path) {
 				prom_printf("No stdout-path in root node.\n");
 				prom_halt();
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/3 sparc: kernel: Fix reference leak in jbusmc_probe

In reply to Miaoqian Lin

of_find_node_by_path() returns a node pointer with refcount incremented, we should use of_node_put() on it when not need anymore.
Add missing of_node_put() to avoid refcount leak.

Fixes 85269eb5542b ("sparc64: Add JBUS UltraSPARC-IIIi support to memory controller driver.")
---
 arch/sparc/kernel/chmc.c | 1 +
 1 file changed, 1 insertion(+)
arch/sparc/kernel/chmc.c +1 -0
index 6ff43df740e0..9cc1b92ffff9 100644
@@ -409,6 +409,7 @@ static int jbusmc_probe(struct platform_device *op)
 		goto out;
 	}
 	mem_regs = of_get_property(mem_node, "reg", &len);
+	of_node_put(mem_node);
 	if (!mem_regs) {
 		printk(KERN_ERR PFX "Cannot get reg property of /memory node.\n");
 		goto out;
Signature · 1 line
2.25.1