ice: Fix memory leak in ice_set_ringparam()
Subsystems (3)
PATCH 1/1 ice: Fix memory leak in ice_set_ringparam()
From: Zilin Guan <[email protected]>
[ Upstream commit fe868b499d16f55bbeea89992edb98043c9de416 ]
In ice_set_ringparam, tx_rings and xdp_rings are allocated before rx_rings. If the allocation of rx_rings fails, the code jumps to the done label leaking both tx_rings and xdp_rings. Furthermore, if the setup of an individual Rx ring fails during the loop, the code jumps to the free_tx label which releases tx_rings but leaks xdp_rings.
Fix this by introducing a free_xdp label and updating the error paths to ensure both xdp_rings and tx_rings are properly freed if rx_rings allocation or setup fails.
Compile tested only. Issue found using a prototype static analysis tool and code review.
--- drivers/net/ethernet/intel/ice/ice_ethtool.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ice/ice_ethtool.c +9 -2
@@ -2847,7 +2847,7 @@ ice_set_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring, rx_rings =kcalloc (vsi->num_rxq,sizeof (*rx_rings),GFP_KERNEL );if (!rx_rings) { err = -ENOMEM ; - goto done; + goto free_xdp; }ice_for_each_rxq (vsi, i) {
@@ -2877,7 +2877,7 @@ ice_set_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring, }kfree (rx_rings); err = -ENOMEM ; - goto free_tx; + goto free_xdp; } }
@@ -2928,6 +2928,13 @@ ice_set_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring, } goto done; +free_xdp: +if (xdp_rings) { +ice_for_each_xdp_txq (vsi, i) +ice_free_tx_ring (&xdp_rings[i]); +kfree (xdp_rings); + } + free_tx:/* error cleanup if the Rx allocations failed after getting Tx */ if (tx_rings) {
Signature · 1 line
2.17.1
Quoted 2 lines · Rajani Kantha
Backport of
fe868b499d16("ice: Fix memory leak inice_set_ringparam()") to 6.6.y.
Queued for 6.6, thanks.
--
Thanks,
Sasha