mtd: rawnand: meson: Add of_node_put() before return
diff mbox series

Message ID 20190709171640.13511-1-nishkadg.linux@gmail.com
State Not Applicable
Headers show
Series
  • mtd: rawnand: meson: Add of_node_put() before return
Related show

Commit Message

Nishka Dasgupta July 9, 2019, 5:16 p.m. UTC
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.
Issue found with Coccinelle.

Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
---
 drivers/mtd/nand/raw/meson_nand.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Liang Yang July 18, 2019, 3:58 a.m. UTC | #1
Hi Nishka,

On 2019/7/10 1:16, 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.
> Issue found with Coccinelle.
> 
> Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
> ---
>   drivers/mtd/nand/raw/meson_nand.c | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c
> index ea57ddcec41e..1b82b687e5a5 100644
> --- a/drivers/mtd/nand/raw/meson_nand.c
> +++ b/drivers/mtd/nand/raw/meson_nand.c
> @@ -1320,6 +1320,7 @@ static int meson_nfc_nand_chips_init(struct device *dev,
>   		ret = meson_nfc_nand_chip_init(dev, nfc, nand_np);
>   		if (ret) {
>   			meson_nfc_nand_chip_cleanup(nfc);
> +			of_node_put(nand_np);

Thank you. Looks good to me:
Acked-by: Liang Yang <liang.yang@amlogic.com>

>   			return ret;
>   		}
>   	}
>
Miquel Raynal July 25, 2019, 7:55 a.m. UTC | #2
On Tue, 2019-07-09 at 17:16:40 UTC, 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.
> Issue found with Coccinelle.
> 
> Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
> Acked-by: Liang Yang <liang.yang@amlogic.com>

Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks.

Miquel

Patch
diff mbox series

diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c
index ea57ddcec41e..1b82b687e5a5 100644
--- a/drivers/mtd/nand/raw/meson_nand.c
+++ b/drivers/mtd/nand/raw/meson_nand.c
@@ -1320,6 +1320,7 @@  static int meson_nfc_nand_chips_init(struct device *dev,
 		ret = meson_nfc_nand_chip_init(dev, nfc, nand_np);
 		if (ret) {
 			meson_nfc_nand_chip_cleanup(nfc);
+			of_node_put(nand_np);
 			return ret;
 		}
 	}