| Message ID | 20190709170837.13315-1-nishkadg.linux@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Miquel Raynal |
| Headers | show |
| Series | mtd: rawnand: vf610_nfc: Add of_node_put() before goto | expand |
On 2019-07-09 19:08, Nishka Dasgupta wrote: > Each iteration of for_each_available_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 before the > goto. > Issue found with Coccinelle. > > Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com> Looks good to me: Reviewed-by: Stefan Agner <stefan@agner.ch> -- Stefan > --- > drivers/mtd/nand/raw/vf610_nfc.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/mtd/nand/raw/vf610_nfc.c b/drivers/mtd/nand/raw/vf610_nfc.c > index e4fe8c4bc711..6b399a75f9ae 100644 > --- a/drivers/mtd/nand/raw/vf610_nfc.c > +++ b/drivers/mtd/nand/raw/vf610_nfc.c > @@ -862,6 +862,7 @@ static int vf610_nfc_probe(struct platform_device *pdev) > dev_err(nfc->dev, > "Only one NAND chip supported!\n"); > err = -EINVAL; > + of_node_put(child); > goto err_disable_clk; > }
On Tue, 2019-07-09 at 17:08:37 UTC, Nishka Dasgupta wrote: > Each iteration of for_each_available_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 before the > goto. > Issue found with Coccinelle. > > Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com> > Reviewed-by: Stefan Agner <stefan@agner.ch> Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks. Miquel
diff --git a/drivers/mtd/nand/raw/vf610_nfc.c b/drivers/mtd/nand/raw/vf610_nfc.c index e4fe8c4bc711..6b399a75f9ae 100644 --- a/drivers/mtd/nand/raw/vf610_nfc.c +++ b/drivers/mtd/nand/raw/vf610_nfc.c @@ -862,6 +862,7 @@ static int vf610_nfc_probe(struct platform_device *pdev) dev_err(nfc->dev, "Only one NAND chip supported!\n"); err = -EINVAL; + of_node_put(child); goto err_disable_clk; }
Each iteration of for_each_available_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 before the goto. Issue found with Coccinelle. Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com> --- drivers/mtd/nand/raw/vf610_nfc.c | 1 + 1 file changed, 1 insertion(+)