net: stmmac: dwc-qos: fix clk prepare/enable leak on probe failure
Subsystems (4)
PATCH 1/1 net: stmmac: dwc-qos: fix clk prepare/enable leak on probe failure
dwc_eth_dwmac_probe() gets bulk clocks, and then prepares and enables them. Unfortunately, if dwc_eth_dwmac_config_dt() or stmmac_dvr_probe() fail, we leave the clocks prepared and enabled. Fix this by using devm_clk_bulk_get_all_enabled() to combine the steps and provide devm based release of the prepare and enable state.
This also fixes a similar leakin dwc_eth_dwmac_remove() which wasn't correctly retrieving the struct plat_stmmacenet_data. This becomes unnecessary.
--- .../net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c +2 -11
@@ -330,15 +330,11 @@ static int dwc_eth_dwmac_probe(struct platform_device *pdev)if (IS_ERR (plat_dat))return PTR_ERR (plat_dat); - ret =devm_clk_bulk_get_all (&pdev->dev, &plat_dat->clks); + ret =devm_clk_bulk_get_all_enabled (&pdev->dev, &plat_dat->clks);if (ret <0 ) -return dev_err_probe (&pdev->dev, ret,"Failed to retrieve all required clocks\n" ); +return dev_err_probe (&pdev->dev, ret,"Failed to retrieve and enable all required clocks\n" ); plat_dat->num_clks = ret; - ret =clk_bulk_prepare_enable (plat_dat->num_clks, plat_dat->clks); -if (ret) -return dev_err_probe (&pdev->dev, ret,"Failed to enable clocks\n" ); - plat_dat->stmmac_clk =stmmac_pltfr_find_clk (plat_dat, data->stmmac_clk_name);
@@ -346,7 +342,6 @@ static int dwc_eth_dwmac_probe(struct platform_device *pdev) ret = data->probe (pdev, plat_dat, &stmmac_res);if (ret <0 ) {dev_err_probe (&pdev->dev, ret,"failed to probe subdriver\n" ); -clk_bulk_disable_unprepare (plat_dat->num_clks, plat_dat->clks);return ret; }
@@ -370,15 +365,11 @@ static int dwc_eth_dwmac_probe(struct platform_device *pdev)static void dwc_eth_dwmac_remove (struct platform_device *pdev) {const struct dwc_eth_dwmac_data *data =device_get_match_data (&pdev->dev); -struct plat_stmmacenet_data *plat_dat =dev_get_platdata (&pdev->dev);stmmac_dvr_remove (&pdev->dev);if (data->remove) data->remove (pdev); - -if (plat_dat) -clk_bulk_disable_unprepare (plat_dat->num_clks, plat_dat->clks); }static const struct of_device_id dwc_eth_dwmac_match[] = {
Signature · 1 line
2.30.2
Quoted 11 lines · Russell King (Oracle)
dwc_eth_dwmac_probe()gets bulk clocks, and then prepares and enables them. Unfortunately, ifdwc_eth_dwmac_config_dt()orstmmac_dvr_probe()fail, we leave the clocks prepared and enabled. Fix this by usingdevm_clk_bulk_get_all_enabled()to combine the steps and provide devm based release of the prepare and enable state.This also fixes a similar leakin
dwc_eth_dwmac_remove()which wasn't correctly retrieving the structplat_stmmacenet_data. This becomes unnecessary.Signed-off-by Russell King (Oracle) <[email protected]>
Thanks Russell,
Probably this wants:
Otherwise looks good to me.
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 11 lines · On Fri, 08 Aug 2025 13:16:39 +0100 you wrote:
dwc_eth_dwmac_probe()gets bulk clocks, and then prepares and enables them. Unfortunately, ifdwc_eth_dwmac_config_dt()orstmmac_dvr_probe()fail, we leave the clocks prepared and enabled. Fix this by usingdevm_clk_bulk_get_all_enabled()to combine the steps and provide devm based release of the prepare and enable state.This also fixes a similar leakin
dwc_eth_dwmac_remove()which wasn't correctly retrieving the structplat_stmmacenet_data. This becomes unnecessary.[...]
Here is the summary with links:
- [net] net: stmmac: dwc-qos: fix clk prepare/enable leak on probe failure
https://git.kernel.org/netdev/net/c/89886abd0734
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html