Skip to contentSkip to conversation

pinctrl: sprd: Add of_node_put() before return to prevent memory leak

PATCH In review Nishka Dasgupta 3 participants 3 messages Aug 8, 2019 – Aug 10, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pinctrl: sprd: Add of_node_put() before return to prevent memory leak

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

---
 drivers/pinctrl/sprd/pinctrl-sprd.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/pinctrl/sprd/pinctrl-sprd.c +7 -2
index c31b58168772..5abb64da2c0d 100644
@@ -940,8 +940,10 @@ static int sprd_pinctrl_parse_dt(struct sprd_pinctrl *sprd_pctl)
 
 	for_each_child_of_node(np, child) {
 		ret = sprd_pinctrl_parse_groups(child, sprd_pctl, grp);
-		if (ret)
+		if (ret) {
+			of_node_put(child);
 			return ret;
+		}
 
 		*temp++ = grp->name;
 		grp++;
@@ -950,8 +952,11 @@ static int sprd_pinctrl_parse_dt(struct sprd_pinctrl *sprd_pctl)
 			for_each_child_of_node(child, sub_child) {
 				ret = sprd_pinctrl_parse_groups(sub_child,
 								sprd_pctl, grp);
-				if (ret)
+				if (ret) {
+					of_node_put(sub_child);
+					of_node_put(child);
 					return ret;
+				}
 
 				*temp++ = grp->name;
 				grp++;
Signature · 1 line
2.19.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Nishka Dasgupta

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

Yes, thanks for your fix.

Quoted 36 lines
---
 drivers/pinctrl/sprd/pinctrl-sprd.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/pinctrl/sprd/pinctrl-sprd.c +7 -3
index c31b58168772..5abb64da2c0d 100644
@@ -940,8 +940,10 @@ static int sprd_pinctrl_parse_dt(struct sprd_pinctrl *sprd_pctl)
 
        for_each_child_of_node(np, child) {
                ret = sprd_pinctrl_parse_groups(child, sprd_pctl, grp);
-               if (ret)
+               if (ret) {
+                       of_node_put(child);
                        return ret;
+               }
 
                *temp++ = grp->name;
                grp++;
@@ -950,8 +952,11 @@ static int sprd_pinctrl_parse_dt(struct sprd_pinctrl *sprd_pctl)
                        for_each_child_of_node(child, sub_child) {
                                ret = sprd_pinctrl_parse_groups(sub_child,
                                                                sprd_pctl, grp);
-                               if (ret)
+                               if (ret) {
+                                       of_node_put(sub_child);
+                                       of_node_put(child);
                                        return ret;
+                               }
 
                                *temp++ = grp->name;
                                grp++;
--

2.19.1

Signature · 2 lines
Baolin Wang
Best Regards
#2 lore raw
In reply to Nishka Dasgupta
Quoted 7 lines · Nishka Dasgupta

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

Patch applied with Baolin's review tag.

Yours,
Linus Walleij