| Message ID | 20190804154948.4584-1-nishkadg.linux@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | pinctrl: spear: spear: Add of_node_put() before return | expand |
On 04-08-19, 21:19, Nishka Dasgupta 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> > --- > drivers/pinctrl/spear/pinctrl-spear.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/pinctrl/spear/pinctrl-spear.c b/drivers/pinctrl/spear/pinctrl-spear.c > index c4f850345dc4..7ec19c73f870 100644 > --- a/drivers/pinctrl/spear/pinctrl-spear.c > +++ b/drivers/pinctrl/spear/pinctrl-spear.c > @@ -157,12 +157,16 @@ static int spear_pinctrl_dt_node_to_map(struct pinctrl_dev *pctldev, > /* calculate number of maps required */ > for_each_child_of_node(np_config, np) { > ret = of_property_read_string(np, "st,function", &function); > - if (ret < 0) > + if (ret < 0) { > + of_node_put(np); > return ret; > + } > > ret = of_property_count_strings(np, "st,pins"); > - if (ret < 0) > + if (ret < 0) { > + of_node_put(np); > return ret; > + } > > count += ret; > } Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
On Sun, Aug 4, 2019 at 5:50 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 > two places. > Issue found with Coccinelle. > > Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com> Patch applied with Viresh's ACK. Yours, Linus Walleij
diff --git a/drivers/pinctrl/spear/pinctrl-spear.c b/drivers/pinctrl/spear/pinctrl-spear.c index c4f850345dc4..7ec19c73f870 100644 --- a/drivers/pinctrl/spear/pinctrl-spear.c +++ b/drivers/pinctrl/spear/pinctrl-spear.c @@ -157,12 +157,16 @@ static int spear_pinctrl_dt_node_to_map(struct pinctrl_dev *pctldev, /* calculate number of maps required */ for_each_child_of_node(np_config, np) { ret = of_property_read_string(np, "st,function", &function); - if (ret < 0) + if (ret < 0) { + of_node_put(np); return ret; + } ret = of_property_count_strings(np, "st,pins"); - if (ret < 0) + if (ret < 0) { + of_node_put(np); return ret; + } count += ret; }
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/spear/pinctrl-spear.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)