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

Commit 67ac0ef9 authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by Greg Kroah-Hartman
Browse files

phy: renesas: rcar-gen2: Fix memory leak at error paths 



[ Upstream commit d4a36e82924d3305a17ac987a510f3902df5a4b2 ]

This patch fixes memory leak at error paths of the probe function.
In for_each_child_of_node, if the loop returns, the driver should
call of_put_node() before returns.

Reported-by: default avatarJulia Lawall <julia.lawall@lip6.fr>
Fixes: 1233f59f ("phy: Renesas R-Car Gen2 PHY driver")
Signed-off-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 34db79ae

drivers/phy/phy-rcar-gen2.c

+2 −0
Original line number Diff line number Diff line
@@ -288,6 +288,7 @@ static int rcar_gen2_phy_probe(struct platform_device *pdev) 
		error = of_property_read_u32(np, "reg", &channel_num);

		if (error || channel_num > 2) {

			dev_err(dev, "Invalid \"reg\" property\n");

			of_node_put(np);

			return error;

		}

		channel->select_mask = select_mask[channel_num];
@@ -303,6 +304,7 @@ static int rcar_gen2_phy_probe(struct platform_device *pdev) 
						   &rcar_gen2_phy_ops);

			if (IS_ERR(phy->phy)) {

				dev_err(dev, "Failed to create PHY\n");

				of_node_put(np);

				return PTR_ERR(phy->phy);

			}

			phy_set_drvdata(phy->phy, phy);