| From 36a518dcee7fa81ce4cfd3876625d2808d5d086d Mon Sep 17 00:00:00 2001 |
| From: Nishka Dasgupta <nishkadg.linux@gmail.com> |
| Date: Tue, 9 Jul 2019 22:40:16 +0530 |
| Subject: [PATCH] mtd: rawnand: oxnas: Add of_node_put() |
| |
| commit c436f68beeb20f2f92937677db1d9069b0dd2a3d upstream. |
| |
| Each iteration of for_each_child_of_node puts the previous node, but in |
| the case of a goto from the middle of the loop, there is no put, thus |
| causing a memory leak. Hence add an of_node_put under a new goto to put |
| the node at a loop exit. |
| Issue found with Coccinelle. |
| |
| Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com> |
| Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/mtd/nand/raw/oxnas_nand.c b/drivers/mtd/nand/raw/oxnas_nand.c |
| index 30c51f772de6..c43cb4d92d3d 100644 |
| --- a/drivers/mtd/nand/raw/oxnas_nand.c |
| +++ b/drivers/mtd/nand/raw/oxnas_nand.c |
| @@ -116,7 +116,7 @@ static int oxnas_nand_probe(struct platform_device *pdev) |
| GFP_KERNEL); |
| if (!chip) { |
| err = -ENOMEM; |
| - goto err_clk_unprepare; |
| + goto err_release_child; |
| } |
| |
| chip->controller = &oxnas->base; |
| @@ -137,12 +137,12 @@ static int oxnas_nand_probe(struct platform_device *pdev) |
| /* Scan to find existence of the device */ |
| err = nand_scan(chip, 1); |
| if (err) |
| - goto err_clk_unprepare; |
| + goto err_release_child; |
| |
| err = mtd_device_register(mtd, NULL, 0); |
| if (err) { |
| nand_release(chip); |
| - goto err_clk_unprepare; |
| + goto err_release_child; |
| } |
| |
| oxnas->chips[nchips] = chip; |
| @@ -159,6 +159,8 @@ static int oxnas_nand_probe(struct platform_device *pdev) |
| |
| return 0; |
| |
| +err_release_child: |
| + of_node_put(nand_np); |
| err_clk_unprepare: |
| clk_disable_unprepare(oxnas->clk); |
| return err; |
| -- |
| 2.27.0 |
| |