Skip to contentSkip to conversation

bus: ti-sysc: Fix /chosen node reference leak

PATCH Applied Yuho Choi 3 participants 4 messages Jun 15 – Aug 31 OMAP2+ support

lore
Share & tools
lore

Yuho Choi

author
#0 lore raw

PATCH 1/1 bus: ti-sysc: Fix /chosen node reference leak

sysc_init_stdout_path() gets the /chosen node with of_find_node_by_path() to read stdout-path. The function then overwrites the local node pointer with the stdout-path lookup result, or exits on error, without dropping the /chosen reference.

Keep the /chosen node in a separate variable and put it after the stdout-path value has been used for the lookup. The successful stdout node lookup remains referenced by the cached stdout_path pointer.

Fixes 3bb37c8e6e6a ("bus: ti-sysc: Handle stdout-path for debug console")
---
 drivers/bus/ti-sysc.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/bus/ti-sysc.c +8 -4
index a5b9507de37c..e118b900c9ac 100644
@@ -682,6 +682,7 @@ static struct device_node *stdout_path;
 
 static void sysc_init_stdout_path(struct sysc *ddata)
 {
+	struct device_node *chosen;
 	struct device_node *np = NULL;
 	const char *uart;
 
@@ -691,15 +692,18 @@ static void sysc_init_stdout_path(struct sysc *ddata)
 	if (stdout_path)
 		return;
 
-	np = of_find_node_by_path("/chosen");
-	if (!np)
+	chosen = of_find_node_by_path("/chosen");
+	if (!chosen)
 		goto err;
 
-	uart = of_get_property(np, "stdout-path", NULL);
-	if (!uart)
+	uart = of_get_property(chosen, "stdout-path", NULL);
+	if (!uart) {
+		of_node_put(chosen);
 		goto err;
+	}
 
 	np = of_find_node_by_path(uart);
+	of_node_put(chosen);
 	if (!np)
 		goto err;
 
Signature · 1 line
2.43.0
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 11 lines · On Mon, 15 Jun 2026 16:05:40 -0400 Yuho Choi <[email protected]> wrote:

sysc_init_stdout_path() gets the /chosen node with of_find_node_by_path() to read stdout-path. The function then overwrites the local node pointer with the stdout-path lookup result, or exits on error, without dropping the /chosen reference.

Keep the /chosen node in a separate variable and put it after the stdout-path value has been used for the lookup. The successful stdout node lookup remains referenced by the cached stdout_path pointer.

Fixes 3bb37c8e6e6a ("bus: ti-sysc: Handle stdout-path for debug console")
author
#2 lore raw
In reply to Yuho Choi

Hi,

Just a gentle ping on this patch.

I would appreciate any feedback when you have a chance to review this.

Thanks

Quoted 54 lines · Yuho Choi

sysc_init_stdout_path() gets the /chosen node with of_find_node_by_path() to read stdout-path. The function then overwrites the local node pointer with the stdout-path lookup result, or exits on error, without dropping the /chosen reference.

Keep the /chosen node in a separate variable and put it after the stdout-path value has been used for the lookup. The successful stdout node lookup remains referenced by the cached stdout_path pointer.

Fixes 3bb37c8e6e6a ("bus: ti-sysc: Handle stdout-path for debug console")
---
 drivers/bus/ti-sysc.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/bus/ti-sysc.c +8 -5
index a5b9507de37c..e118b900c9ac 100644
@@ -682,6 +682,7 @@ static struct device_node *stdout_path;
 
 static void sysc_init_stdout_path(struct sysc *ddata)
 {
+       struct device_node *chosen;
        struct device_node *np = NULL;
        const char *uart;
 
@@ -691,15 +692,18 @@ static void sysc_init_stdout_path(struct sysc *ddata)
        if (stdout_path)
                return;
 
-       np = of_find_node_by_path("/chosen");
-       if (!np)
+       chosen = of_find_node_by_path("/chosen");
+       if (!chosen)
                goto err;
 
-       uart = of_get_property(np, "stdout-path", NULL);
-       if (!uart)
+       uart = of_get_property(chosen, "stdout-path", NULL);
+       if (!uart) {
+               of_node_put(chosen);
                goto err;
+       }
 
        np = of_find_node_by_path(uart);
+       of_node_put(chosen);
        if (!np)
                goto err;
 
--

2.43.0

maintainer Applied
#3 lore raw
In reply to Yuho Choi
Quoted 10 lines · Yuho Choi

sysc_init_stdout_path() gets the /chosen node with of_find_node_by_path() to read stdout-path. The function then overwrites the local node pointer with the stdout-path lookup result, or exits on error, without dropping the /chosen reference.

Keep the /chosen node in a separate variable and put it after the stdout-path value has been used for the lookup. The successful stdout node lookup remains referenced by the cached stdout_path pointer.

[...]

Applied, thanks!

[1/1] bus: ti-sysc: Fix /chosen node reference leak
(no commit info)

Best regards,

Signature · 1 line
Kevin Hilman (TI) <[email protected]>