* [PATCH] pinctrl: spear: spear: Add of_node_put() before return
@ 2019-08-04 15:49 Nishka Dasgupta
2019-08-06 3:42 ` Viresh Kumar
2019-08-06 14:19 ` Linus Walleij
0 siblings, 2 replies; 3+ messages in thread
From: Nishka Dasgupta @ 2019-08-04 15:49 UTC (permalink / raw)
To: vireshk, linus.walleij, linux-arm-kernel, linux-gpio; +Cc: 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.
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;
}
--
2.19.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] pinctrl: spear: spear: Add of_node_put() before return
2019-08-04 15:49 [PATCH] pinctrl: spear: spear: Add of_node_put() before return Nishka Dasgupta
@ 2019-08-06 3:42 ` Viresh Kumar
2019-08-06 14:19 ` Linus Walleij
1 sibling, 0 replies; 3+ messages in thread
From: Viresh Kumar @ 2019-08-06 3:42 UTC (permalink / raw)
To: Nishka Dasgupta; +Cc: vireshk, linus.walleij, linux-arm-kernel, linux-gpio
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>
--
viresh
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] pinctrl: spear: spear: Add of_node_put() before return
2019-08-04 15:49 [PATCH] pinctrl: spear: spear: Add of_node_put() before return Nishka Dasgupta
2019-08-06 3:42 ` Viresh Kumar
@ 2019-08-06 14:19 ` Linus Walleij
1 sibling, 0 replies; 3+ messages in thread
From: Linus Walleij @ 2019-08-06 14:19 UTC (permalink / raw)
To: Nishka Dasgupta; +Cc: Viresh Kumar, Linux ARM, open list:GPIO SUBSYSTEM
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-08-06 14:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-08-04 15:49 [PATCH] pinctrl: spear: spear: Add of_node_put() before return Nishka Dasgupta
2019-08-06 3:42 ` Viresh Kumar
2019-08-06 14:19 ` Linus Walleij
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).