On Tue, Feb 21, 2023 at 11:17:50AM -0800, Tony Nguyen wrote:
> From: Martyna Szapar-Mudlaw <martyna.szapar-mudlaw@xxxxxxxxxxxxxxx>
>
> Add missing memory free in the case of partial memory allocation
> in the loop in ice_realloc_zc_buf function.
I don't think that this is correct behaviour for realloc function to
free memory of caller just because target allocation failed.
It should be done in upper level.
Thanks
>
> Fixes: 7e753eb675f0 ("ice: Fix DMA mappings leak")
> Signed-off-by: Martyna Szapar-Mudlaw <martyna.szapar-mudlaw@xxxxxxxxxxxxxxx>
> Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@xxxxxxxxx>
> Tested-by: Chandan Kumar Rout <chandanx.rout@xxxxxxxxx> (A Contingent Worker at Intel)
> Signed-off-by: Tony Nguyen <anthony.l.nguyen@xxxxxxxxx>
> ---
> drivers/net/ethernet/intel/ice/ice_xsk.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/intel/ice/ice_xsk.c b/drivers/net/ethernet/intel/ice/ice_xsk.c
> index 374b7f10b549..9ec02f80a2cf 100644
> --- a/drivers/net/ethernet/intel/ice/ice_xsk.c
> +++ b/drivers/net/ethernet/intel/ice/ice_xsk.c
> @@ -377,8 +377,16 @@ int ice_realloc_zc_buf(struct ice_vsi *vsi, bool zc)
> for_each_set_bit(q, vsi->af_xdp_zc_qps,
> max_t(int, vsi->alloc_txq, vsi->alloc_rxq)) {
> rx_ring = vsi->rx_rings[q];
> - if (ice_realloc_rx_xdp_bufs(rx_ring, zc))
> + if (ice_realloc_rx_xdp_bufs(rx_ring, zc)) {
> + unsigned long qid = q;
> +
> + for_each_set_bit(q, vsi->af_xdp_zc_qps, qid) {
> + rx_ring = vsi->rx_rings[q];
> + zc ? kfree(rx_ring->xdp_buf) :
> + kfree(rx_ring->rx_buf);
> + }
> return -ENOMEM;
> + }
> }
>
> return 0;
> --
> 2.38.1
>
