Skip to contentSkip to conversation

pinctrl: rzn1: Add of_node_put() before return

PATCH In review Nishka Dasgupta 2 participants 2 messages Aug 4, 2019 – Aug 5, 2019

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

PATCH 1/1 pinctrl: rzn1: Add of_node_put() before return

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 three places.
Issue found with Coccinelle.

---
 drivers/pinctrl/pinctrl-rzn1.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/pinctrl/pinctrl-rzn1.c +9 -3
index cc0e5aa9128a..0f6f8a10a53a 100644
@@ -412,8 +412,10 @@ static int rzn1_dt_node_to_map(struct pinctrl_dev *pctldev,
 
 	for_each_child_of_node(np, child) {
 		ret = rzn1_dt_node_to_map_one(pctldev, child, map, num_maps);
-		if (ret < 0)
+		if (ret < 0) {
+			of_node_put(child);
 			return ret;
+		}
 	}
 
 	return 0;
@@ -792,8 +794,10 @@ static int rzn1_pinctrl_parse_functions(struct device_node *np,
 		grp = &ipctl->groups[ipctl->ngroups];
 		grp->func = func->name;
 		ret = rzn1_pinctrl_parse_groups(child, grp, ipctl);
-		if (ret < 0)
+		if (ret < 0) {
+			of_node_put(child);
 			return ret;
+		}
 		i++;
 		ipctl->ngroups++;
 	}
@@ -838,8 +842,10 @@ static int rzn1_pinctrl_probe_dt(struct platform_device *pdev,
 
 	for_each_child_of_node(np, child) {
 		ret = rzn1_pinctrl_parse_functions(child, ipctl, i++);
-		if (ret < 0)
+		if (ret < 0) {
+			of_node_put(child);
 			return ret;
+		}
 	}
 
 	return 0;
Signature · 1 line
2.19.1
Reviewed-by on v1 1/1
#1 lore raw

CC Phil

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 three places.
Issue found with Coccinelle.

i.e. will queue in sh-pfc-for-v5.4.

Quoted 34 lines
---
 drivers/pinctrl/pinctrl-rzn1.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/pinctrl/pinctrl-rzn1.c +6 -2
index cc0e5aa9128a..0f6f8a10a53a 100644
@@ -412,8 +412,10 @@ static int rzn1_dt_node_to_map(struct pinctrl_dev *pctldev,
 
        for_each_child_of_node(np, child) {
                ret = rzn1_dt_node_to_map_one(pctldev, child, map, num_maps);
-               if (ret < 0)
+               if (ret < 0) {
+                       of_node_put(child);
                        return ret;
+               }
        }
 
        return 0;
@@ -792,8 +794,10 @@ static int rzn1_pinctrl_parse_functions(struct device_node *np,
                grp = &ipctl->groups[ipctl->ngroups];
                grp->func = func->name;
                ret = rzn1_pinctrl_parse_groups(child, grp, ipctl);
-               if (ret < 0)
+               if (ret < 0) {
+                       of_node_put(child);
                        return ret;
+               }
                i++;
                ipctl->ngroups++;
        }
@@ -838,8 +842,10 @@ static int rzn1_pinctrl_probe_dt(struct platform_device *pdev,
 

drivers/pinctrl/pinctrl-rzn1.c static int rzn1_pinctrl_probe_dt(struct platform_device *pdev, · line 851

Quoted 10 lines
drivers/pinctrl/pinctrl-rzn1.c +3 -1
        for_each_child_of_node(np, child) {
                ret = rzn1_pinctrl_parse_functions(child, ipctl, i++);
-               if (ret < 0)
+               if (ret < 0) {
+                       of_node_put(child);
                        return ret;
+               }
        }
 
        return 0;

Gr{oetje,eeting}s,

Geert

Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds