Skip to contentSkip to conversation

of: resolver: Add of_node_put() before return and break

PATCH Applied Nishka Dasgupta 2 participants 2 messages Jul 16, 2019 – Aug 12, 2019 Device tree

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 of: resolver: Add of_node_put() before return and break

Each iteration of for_each_child_of_node puts the previous node, but in the case of a return or break from the middle of the loop, there is no put, thus causing a memory leak. Hence add an of_node_put before the return or break in three places.
Issue found with Coccinelle.

---
 drivers/of/resolver.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/of/resolver.c +9 -3
index c1b67dd7cd6e..83c766233181 100644
@@ -206,16 +206,22 @@ static int adjust_local_phandle_references(struct device_node *local_fixups,
 	for_each_child_of_node(local_fixups, child) {
 
 		for_each_child_of_node(overlay, overlay_child)
-			if (!node_name_cmp(child, overlay_child))
+			if (!node_name_cmp(child, overlay_child)) {
+				of_node_put(overlay_child);
 				break;
+			}
 
-		if (!overlay_child)
+		if (!overlay_child) {
+			of_node_put(child);
 			return -EINVAL;
+		}
 
 		err = adjust_local_phandle_references(child, overlay_child,
 				phandle_delta);
-		if (err)
+		if (err) {
+			of_node_put(child);
 			return err;
+		}
 	}
 
 	return 0;
Signature · 1 line
2.19.1
maintainer Applied
#1 lore raw
Quoted 11 lines · Nishka Dasgupta

Each iteration of for_each_child_of_node puts the previous node, but in the case of a return or break from the middle of the loop, there is no put, thus causing a memory leak. Hence add an of_node_put before the return or break in three places.
Issue found with Coccinelle.

---
 drivers/of/resolver.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

Applied, thanks.

Rob