renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-16 17:23:55 +08:00
Code

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

Browse Source 
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: Julia Lawall <julia.lawall@lip6.fr>
Fixes: 1233f59f74 ("phy: Renesas R-Car Gen2 PHY driver")
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
This commit is contained in:
Yoshihiro Shimoda 2019-05-28 14:04:02 +09:00 committed by Kishon Vijay Abraham I
parent d98010817a
commit d4a36e8292
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/phy/renesas/phy-rcar-gen2.c
View File

@ -391,6 +391,7 @@ static int rcar_gen2_phy_probe(struct platform_device *pdev)
error = of_property_read_u32(np, "reg", &channel_num); error = of_property_read_u32(np, "reg", &channel_num);
if (error || channel_num > 2) { if (error || channel_num > 2) {
dev_err(dev, "Invalid \"reg\" property\n"); dev_err(dev, "Invalid \"reg\" property\n");
of_node_put(np);
return error; return error;
} }
channel->select_mask = select_mask[channel_num]; channel->select_mask = select_mask[channel_num];
@ -406,6 +407,7 @@ static int rcar_gen2_phy_probe(struct platform_device *pdev)
data->gen2_phy_ops); data->gen2_phy_ops);
if (IS_ERR(phy->phy)) { if (IS_ERR(phy->phy)) {
dev_err(dev, "Failed to create PHY\n"); dev_err(dev, "Failed to create PHY\n");
of_node_put(np);
return PTR_ERR(phy->phy); return PTR_ERR(phy->phy);
} }
phy_set_drvdata(phy->phy, phy); phy_set_drvdata(phy->phy, phy);