| Message ID | 20190804154029.2749-1-nishkadg.linux@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | pinctrl: rzn1: Add of_node_put() before return | expand |
CC Phil On Sun, Aug 4, 2019 at 5:40 PM Nishka Dasgupta <nishkadg.linux@gmail.com> wrote: > 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. > > Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> i.e. will queue in sh-pfc-for-v5.4. > --- > drivers/pinctrl/pinctrl-rzn1.c | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > > diff --git a/drivers/pinctrl/pinctrl-rzn1.c b/drivers/pinctrl/pinctrl-rzn1.c > index cc0e5aa9128a..0f6f8a10a53a 100644 > --- a/drivers/pinctrl/pinctrl-rzn1.c > +++ b/drivers/pinctrl/pinctrl-rzn1.c > @@ -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; Gr{oetje,eeting}s, Geert
diff --git a/drivers/pinctrl/pinctrl-rzn1.c b/drivers/pinctrl/pinctrl-rzn1.c index cc0e5aa9128a..0f6f8a10a53a 100644 --- a/drivers/pinctrl/pinctrl-rzn1.c +++ b/drivers/pinctrl/pinctrl-rzn1.c @@ -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;
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. Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com> --- drivers/pinctrl/pinctrl-rzn1.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)