Commit b6193d70 authored by Saeed Mahameed's avatar Saeed Mahameed
Browse files

net/mlx5e: Fix error handling in mlx5e_refresh_tirs 



Allocation failure is outside the critical lock section and should
return immediately rather than jumping to the unlock section.

Also unlock as soon as required and remove the now redundant jump label.

Fixes: 80a2a902 ("net/mlx5e: Add a lock on tir list")
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 36859199

drivers/net/ethernet/mellanox/mlx5/core/en_common.c

+4 −7
Original line number Diff line number Diff line
@@ -150,10 +150,8 @@ int mlx5e_refresh_tirs(struct mlx5e_priv *priv, bool enable_uc_lb, 


	inlen = MLX5_ST_SZ_BYTES(modify_tir_in);

	in = kvzalloc(inlen, GFP_KERNEL);

	if (!in) {

		err = -ENOMEM;

		goto out;

	}

	if (!in)

		return -ENOMEM;



	if (enable_uc_lb)

		lb_flags = MLX5_TIRC_SELF_LB_BLOCK_BLOCK_UNICAST;
@@ -171,14 +169,13 @@ int mlx5e_refresh_tirs(struct mlx5e_priv *priv, bool enable_uc_lb, 
		tirn = tir->tirn;

		err = mlx5_core_modify_tir(mdev, tirn, in);

		if (err)

			goto out;

			break;

	}

	mutex_unlock(&mdev->mlx5e_res.hw_objs.td.list_lock);



out:

	kvfree(in);

	if (err)

		netdev_err(priv->netdev, "refresh tir(0x%x) failed, %d\n", tirn, err);

	mutex_unlock(&mdev->mlx5e_res.hw_objs.td.list_lock);



	return err;

}