| Message ID | Ys2IUUhvm2sfLEps@kili (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 23aa6d5088e3bd65de77c5c307237b9937f8b48a |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] net: stmmac: fix leaks in probe | expand |
Hello: This patch was applied to netdev/net.git (master) by David S. Miller <davem@davemloft.net>: On Tue, 12 Jul 2022 17:42:25 +0300 you wrote: > These two error paths should clean up before returning. > > Fixes: 2bb4b98b60d7 ("net: stmmac: Add Ingenic SoCs MAC support.") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > --- > From static analysis, not tested. > > [...] Here is the summary with links: - [net] net: stmmac: fix leaks in probe https://git.kernel.org/netdev/net/c/23aa6d5088e3 You are awesome, thank you!
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-ingenic.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-ingenic.c index 9a6d819b84ae..378b4dd826bb 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-ingenic.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-ingenic.c @@ -273,7 +273,8 @@ static int ingenic_mac_probe(struct platform_device *pdev) mac->tx_delay = tx_delay_ps * 1000; } else { dev_err(&pdev->dev, "Invalid TX clock delay: %dps\n", tx_delay_ps); - return -EINVAL; + ret = -EINVAL; + goto err_remove_config_dt; } } @@ -283,7 +284,8 @@ static int ingenic_mac_probe(struct platform_device *pdev) mac->rx_delay = rx_delay_ps * 1000; } else { dev_err(&pdev->dev, "Invalid RX clock delay: %dps\n", rx_delay_ps); - return -EINVAL; + ret = -EINVAL; + goto err_remove_config_dt; } }
These two error paths should clean up before returning. Fixes: 2bb4b98b60d7 ("net: stmmac: Add Ingenic SoCs MAC support.") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- From static analysis, not tested. drivers/net/ethernet/stmicro/stmmac/dwmac-ingenic.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)