Skip to contentSkip to conversation

ethernet: Fix error handling in xemaclite_of_probe

PATCH Applied Miaoqian Lin 3 participants 3 messages Mar 8, 2022 – Mar 9, 2022

Subsystems (3)
Networking Network drivers Arm/Zynq architecture
lore
Share & tools
lore

Miaoqian Lin

author
#0 lore raw

PATCH 1/1 ethernet: Fix error handling in xemaclite_of_probe

This node pointer is returned by of_parse_phandle() with refcount incremented in this function. Calling of_node_put() to avoid the refcount leak. As the remove function do.

Fixes 5cdaaa12866e ("net: emaclite: adding MDIO and phy lib support")
Signed-off-by Miaoqian Lin <[email protected]>
---
 drivers/net/ethernet/xilinx/xilinx_emaclite.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/xilinx/xilinx_emaclite.c +3 -1
index 519599480b15..77fa2cb03aca 100644
@@ -1183,7 +1183,7 @@ static int xemaclite_of_probe(struct platform_device *ofdev)
 	if (rc) {
 		dev_err(dev,
 			"Cannot register network device, aborting\n");
-		goto error;
+		goto put_node;
 	}
 
 	dev_info(dev,

@@ -1191,6 +1191,8 @@ static int xemaclite_of_probe(struct platform_device *ofdev)
 		 (unsigned long __force)ndev->mem_start, lp->base_addr, ndev->irq);
 	return 0;
 
+put_node:
+	of_node_put(lp->phy_node);
 error:
 	free_netdev(ndev);
 	return rc;
Signature · 1 line
2.17.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · Miaoqian Lin

This node pointer is returned by of_parse_phandle() with refcount incremented in this function. Calling of_node_put() to avoid the refcount leak. As the remove function do.

Fixes 5cdaaa12866e ("net: emaclite: adding MDIO and phy lib support")
Signed-off-by Miaoqian Lin <[email protected]>
Reviewed-by Andrew Lunn <[email protected]>

Andrew

CI Applied
#2 lore raw
In reply to Miaoqian Lin
This patch was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:

Quoted 8 lines · On Tue, 8 Mar 2022 02:47:49 +0000 you wrote:

This node pointer is returned by of_parse_phandle() with refcount incremented in this function. Calling of_node_put() to avoid the refcount leak. As the remove function do.

Fixes 5cdaaa12866e ("net: emaclite: adding MDIO and phy lib support")
Signed-off-by Miaoqian Lin <[email protected]>

[...]

Here is the summary with links:
- ethernet: Fix error handling in xemaclite_of_probe

    https://git.kernel.org/netdev/net/c/b19ab4b38b06

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html