* [PATCH] pinctrl: freescale: imx: Add of_node_put() before return
@ 2019-08-08 7:47 Nishka Dasgupta
2019-08-08 14:56 ` Philipp Zabel
2019-08-10 8:30 ` Linus Walleij
0 siblings, 2 replies; 3+ messages in thread
From: Nishka Dasgupta @ 2019-08-08 7:47 UTC (permalink / raw)
To: aisheng.dong, festevam, shawnguo, stefan, kernel, linus.walleij,
s.hauer, linux-imx, linux-gpio, linux-arm-kernel
Cc: Nishka Dasgupta
Each iteration of for_each_child_of_node() puts the previous node;
however, in the case of a return from the middle of the loop, there is no
put, thus causing a memory leak. Hence put of_node_put() statements as
required before two mid-loop return statements.
Issue found with Coccinelle.
Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
---
drivers/pinctrl/freescale/pinctrl-imx.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c b/drivers/pinctrl/freescale/pinctrl-imx.c
index 83ff9532bae6..9f42036c5fbb 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx.c
@@ -672,8 +672,10 @@ static int imx_pinctrl_parse_functions(struct device_node *np,
grp = devm_kzalloc(ipctl->dev, sizeof(struct group_desc),
GFP_KERNEL);
- if (!grp)
+ if (!grp) {
+ of_node_put(child);
return -ENOMEM;
+ }
mutex_lock(&ipctl->mutex);
radix_tree_insert(&pctl->pin_group_tree,
@@ -697,12 +699,17 @@ static bool imx_pinctrl_dt_is_flat_functions(struct device_node *np)
struct device_node *pinctrl_np;
for_each_child_of_node(np, function_np) {
- if (of_property_read_bool(function_np, "fsl,pins"))
+ if (of_property_read_bool(function_np, "fsl,pins")) {
+ of_node_put(function_np);
return true;
+ }
for_each_child_of_node(function_np, pinctrl_np) {
- if (of_property_read_bool(pinctrl_np, "fsl,pins"))
+ if (of_property_read_bool(pinctrl_np, "fsl,pins")) {
+ of_node_put(pinctrl_np);
+ of_node_put(function_np);
return false;
+ }
}
}
--
2.19.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] pinctrl: freescale: imx: Add of_node_put() before return
2019-08-08 7:47 [PATCH] pinctrl: freescale: imx: Add of_node_put() before return Nishka Dasgupta
@ 2019-08-08 14:56 ` Philipp Zabel
2019-08-10 8:30 ` Linus Walleij
1 sibling, 0 replies; 3+ messages in thread
From: Philipp Zabel @ 2019-08-08 14:56 UTC (permalink / raw)
To: Nishka Dasgupta, aisheng.dong, festevam, shawnguo, stefan,
kernel, linus.walleij, s.hauer, linux-imx, linux-gpio,
linux-arm-kernel
On Thu, 2019-08-08 at 13:17 +0530, Nishka Dasgupta wrote:
> Each iteration of for_each_child_of_node() puts the previous node;
> however, in the case of a return from the middle of the loop, there is no
> put, thus causing a memory leak. Hence put of_node_put() statements as
> required before two mid-loop return statements.
> Issue found with Coccinelle.
>
> Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
> ---
> drivers/pinctrl/freescale/pinctrl-imx.c | 13 ++++++++++---
> 1 file changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c b/drivers/pinctrl/freescale/pinctrl-imx.c
> index 83ff9532bae6..9f42036c5fbb 100644
> --- a/drivers/pinctrl/freescale/pinctrl-imx.c
> +++ b/drivers/pinctrl/freescale/pinctrl-imx.c
> @@ -672,8 +672,10 @@ static int imx_pinctrl_parse_functions(struct device_node *np,
>
> grp = devm_kzalloc(ipctl->dev, sizeof(struct group_desc),
> GFP_KERNEL);
This looks to me like it could just allocate an array of struct
group_desc upfront, just like the group_names array. Same for the
functions in imx_pinctrl_probe_dt(). Not an issue with this patch
though.
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
regards
Philipp
> - if (!grp)
> + if (!grp) {
> + of_node_put(child);
> return -ENOMEM;
> + }
>
> mutex_lock(&ipctl->mutex);
> radix_tree_insert(&pctl->pin_group_tree,
> @@ -697,12 +699,17 @@ static bool imx_pinctrl_dt_is_flat_functions(struct device_node *np)
> struct device_node *pinctrl_np;
>
> for_each_child_of_node(np, function_np) {
> - if (of_property_read_bool(function_np, "fsl,pins"))
> + if (of_property_read_bool(function_np, "fsl,pins")) {
> + of_node_put(function_np);
> return true;
> + }
>
> for_each_child_of_node(function_np, pinctrl_np) {
> - if (of_property_read_bool(pinctrl_np, "fsl,pins"))
> + if (of_property_read_bool(pinctrl_np, "fsl,pins")) {
> + of_node_put(pinctrl_np);
> + of_node_put(function_np);
> return false;
> + }
> }
> }
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] pinctrl: freescale: imx: Add of_node_put() before return
2019-08-08 7:47 [PATCH] pinctrl: freescale: imx: Add of_node_put() before return Nishka Dasgupta
2019-08-08 14:56 ` Philipp Zabel
@ 2019-08-10 8:30 ` Linus Walleij
1 sibling, 0 replies; 3+ messages in thread
From: Linus Walleij @ 2019-08-10 8:30 UTC (permalink / raw)
To: Nishka Dasgupta
Cc: Dong Aisheng, Fabio Estevam, Shawn Guo, Stefan Agner,
Sascha Hauer, Sascha Hauer, NXP Linux Team,
open list:GPIO SUBSYSTEM, Linux ARM
On Thu, Aug 8, 2019 at 9:47 AM Nishka Dasgupta <nishkadg.linux@gmail.com> wrote:
> Each iteration of for_each_child_of_node() puts the previous node;
> however, in the case of a return from the middle of the loop, there is no
> put, thus causing a memory leak. Hence put of_node_put() statements as
> required before two mid-loop return statements.
> Issue found with Coccinelle.
>
> Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
Patch applied with Philipp's ACK.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-08-10 8:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-08 7:47 [PATCH] pinctrl: freescale: imx: Add of_node_put() before return Nishka Dasgupta
2019-08-08 14:56 ` Philipp Zabel
2019-08-10 8:30 ` 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).