| Message ID | 20190808074329.15579-1-nishkadg.linux@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | pinctrl: sprd: Add of_node_put() before return to prevent memory leak | expand |
On Thu, 8 Aug 2019 at 15:43, 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 > two places. > Issue found with Coccinelle. > > Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com> Yes, thanks for your fix. Reviewed-by: Baolin Wang <baolin.wang@linaro.org> > --- > drivers/pinctrl/sprd/pinctrl-sprd.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/drivers/pinctrl/sprd/pinctrl-sprd.c b/drivers/pinctrl/sprd/pinctrl-sprd.c > index c31b58168772..5abb64da2c0d 100644 > --- a/drivers/pinctrl/sprd/pinctrl-sprd.c > +++ b/drivers/pinctrl/sprd/pinctrl-sprd.c > @@ -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 >
On Thu, Aug 8, 2019 at 9:43 AM 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 > two places. > Issue found with Coccinelle. > > Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com> Patch applied with Baolin's review tag. Yours, Linus Walleij
diff --git a/drivers/pinctrl/sprd/pinctrl-sprd.c b/drivers/pinctrl/sprd/pinctrl-sprd.c index c31b58168772..5abb64da2c0d 100644 --- a/drivers/pinctrl/sprd/pinctrl-sprd.c +++ b/drivers/pinctrl/sprd/pinctrl-sprd.c @@ -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++;
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. Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com> --- drivers/pinctrl/sprd/pinctrl-sprd.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)