Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09fc51a9 authored by Nishka Dasgupta's avatar Nishka Dasgupta Committed by Greg Kroah-Hartman
Browse files

mtd: rawnand: oxnas: Add of_node_put() 



[ Upstream commit c436f68beeb20f2f92937677db1d9069b0dd2a3d ]

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: default avatarNishka Dasgupta <nishkadg.linux@gmail.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3431ad8c

drivers/mtd/nand/raw/oxnas_nand.c

+5 −3
Original line number Diff line number Diff line
@@ -123,7 +123,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;
@@ -144,12 +144,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;
@@ -166,6 +166,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;