* [PATCH] irqchip: irq-mbigen: Add of_node_put() before return
@ 2019-07-23 10:39 Nishka Dasgupta
2019-07-26 13:22 ` Marc Zyngier
0 siblings, 1 reply; 2+ messages in thread
From: Nishka Dasgupta @ 2019-07-23 10:39 UTC (permalink / raw)
To: tglx, jason, marc.zyngier, linux-kernel; +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. 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/irqchip/irq-mbigen.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/irqchip/irq-mbigen.c b/drivers/irqchip/irq-mbigen.c
index 3dd28382d5f5..3f09f658e8e2 100644
--- a/drivers/irqchip/irq-mbigen.c
+++ b/drivers/irqchip/irq-mbigen.c
@@ -241,12 +241,15 @@ static int mbigen_of_create_domain(struct platform_device *pdev,
parent = platform_bus_type.dev_root;
child = of_platform_device_create(np, NULL, parent);
- if (!child)
+ if (!child) {
+ of_node_put(np);
return -ENOMEM;
+ }
if (of_property_read_u32(child->dev.of_node, "num-pins",
&num_pins) < 0) {
dev_err(&pdev->dev, "No num-pins property\n");
+ of_node_put(np);
return -EINVAL;
}
@@ -254,8 +257,10 @@ static int mbigen_of_create_domain(struct platform_device *pdev,
mbigen_write_msg,
&mbigen_domain_ops,
mgn_chip);
- if (!domain)
+ if (!domain) {
+ of_node_put(np);
return -ENOMEM;
+ }
}
return 0;
--
2.19.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] irqchip: irq-mbigen: Add of_node_put() before return
2019-07-23 10:39 [PATCH] irqchip: irq-mbigen: Add of_node_put() before return Nishka Dasgupta
@ 2019-07-26 13:22 ` Marc Zyngier
0 siblings, 0 replies; 2+ messages in thread
From: Marc Zyngier @ 2019-07-26 13:22 UTC (permalink / raw)
To: Nishka Dasgupta; +Cc: tglx, jason, linux-kernel
On Tue, 23 Jul 2019 11:39:10 +0100,
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. 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/irqchip/irq-mbigen.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/irqchip/irq-mbigen.c b/drivers/irqchip/irq-mbigen.c
> index 3dd28382d5f5..3f09f658e8e2 100644
> --- a/drivers/irqchip/irq-mbigen.c
> +++ b/drivers/irqchip/irq-mbigen.c
> @@ -241,12 +241,15 @@ static int mbigen_of_create_domain(struct platform_device *pdev,
>
> parent = platform_bus_type.dev_root;
> child = of_platform_device_create(np, NULL, parent);
> - if (!child)
> + if (!child) {
> + of_node_put(np);
> return -ENOMEM;
> + }
>
> if (of_property_read_u32(child->dev.of_node, "num-pins",
> &num_pins) < 0) {
> dev_err(&pdev->dev, "No num-pins property\n");
> + of_node_put(np);
> return -EINVAL;
> }
>
> @@ -254,8 +257,10 @@ static int mbigen_of_create_domain(struct platform_device *pdev,
> mbigen_write_msg,
> &mbigen_domain_ops,
> mgn_chip);
> - if (!domain)
> + if (!domain) {
> + of_node_put(np);
> return -ENOMEM;
> + }
> }
>
> return 0;
> --
> 2.19.1
>
Applied, thanks.
M.
--
Jazz is not dead, it just smells funny.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-07-26 13:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-23 10:39 [PATCH] irqchip: irq-mbigen: Add of_node_put() before return Nishka Dasgupta
2019-07-26 13:22 ` Marc Zyngier
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).