2019-07-23 20:26:22

by Nishka Dasgupta

Subject: [PATCH] irqchip: irq-mbigen: Add of_node_put() before return

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 <[email protected]>
---
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

2019-07-26 13:23:55

by Marc Zyngier

Subject: Re: [PATCH] irqchip: irq-mbigen: Add of_node_put() before return

On Tue, 23 Jul 2019 11:39:10 +0100,
Nishka Dasgupta <[email protected]> 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 <[email protected]>
> ---
> 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.