Skip to content

Commit 30134b7

Browse files
Ansuelkuba-moo
authored andcommitted
net: ethernet: stmicro: stmmac: fix possible memory leak in __stmmac_open
Fix a possible memory leak in __stmmac_open when stmmac_init_phy fails. It's also needed to free everything allocated by stmmac_setup_dma_desc and not just the dma_conf struct. Drop free_dma_desc_resources from __stmmac_open and correctly call free_dma_desc_resources on each user of __stmmac_open on error. Reported-by: Jose Abreu <[email protected]> Fixes: ba39b34 ("net: ethernet: stmicro: stmmac: generate stmmac dma conf before open") Signed-off-by: Christian Marangi <[email protected]> Cc: [email protected] Reviewed-by: Simon Horman <[email protected]> Reviewed-by: Jose Abreu <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 44194cb commit 30134b7

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3873,7 +3873,6 @@ static int __stmmac_open(struct net_device *dev,
38733873

38743874
stmmac_hw_teardown(dev);
38753875
init_error:
3876-
free_dma_desc_resources(priv, &priv->dma_conf);
38773876
phylink_disconnect_phy(priv->phylink);
38783877
init_phy_error:
38793878
pm_runtime_put(priv->device);
@@ -3891,6 +3890,9 @@ static int stmmac_open(struct net_device *dev)
38913890
return PTR_ERR(dma_conf);
38923891

38933892
ret = __stmmac_open(dev, dma_conf);
3893+
if (ret)
3894+
free_dma_desc_resources(priv, dma_conf);
3895+
38943896
kfree(dma_conf);
38953897
return ret;
38963898
}
@@ -5633,12 +5635,15 @@ static int stmmac_change_mtu(struct net_device *dev, int new_mtu)
56335635
stmmac_release(dev);
56345636

56355637
ret = __stmmac_open(dev, dma_conf);
5636-
kfree(dma_conf);
56375638
if (ret) {
5639+
free_dma_desc_resources(priv, dma_conf);
5640+
kfree(dma_conf);
56385641
netdev_err(priv->dev, "failed reopening the interface after MTU change\n");
56395642
return ret;
56405643
}
56415644

5645+
kfree(dma_conf);
5646+
56425647
stmmac_set_rx_mode(dev);
56435648
}
56445649

0 commit comments

Comments
 (0)