Re: [PATCH v3] net/mlx5_core: Add error handling inmlx5_query_nic_vport_qkey_viol_cntr()

Tariq Toukan
2025-05-22T05:51:20Z

On 21/05/2025 16:36, Wentao Liang wrote:
> The function mlx5_query_nic_vport_qkey_viol_cntr() calls the function
> mlx5_query_nic_vport_context() but does not check its return value. This
> could lead to undefined behavior if the query fails. A proper
> implementation can be found in mlx5_nic_vport_query_local_lb().
>
> Add error handling for mlx5_query_nic_vport_context(). If it fails, free
> the out buffer via kvfree() and return error code.
>
> Fixes: 9efa75254593 ("net/mlx5_core: Introduce access functions to query vport RoCE fields")
> Cc: stable@vger.kernel.org # v4.5
> Target: net
> Signed-off-by: Wentao Liang <vulab@iscas.ac.cn>
> ---
> v3: Explicitly mention target branch. Change improper code.
> v2: Remove redundant reassignment. Fix RCT.
>
> drivers/net/ethernet/mellanox/mlx5/core/vport.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/vport.c b/drivers/net/ethernet/mellanox/mlx5/core/vport.c
> index 66e44905c1f0..e4b86633d2fe 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/vport.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/vport.c
> @@ -522,19 +522,22 @@ int mlx5_query_nic_vport_qkey_viol_cntr(struct mlx5_core_dev *mdev,
> {
> u32 *out;
> int outlen = MLX5_ST_SZ_BYTES(query_nic_vport_context_out);
> + int err;
>
> out = kvzalloc(outlen, GFP_KERNEL);
> if (!out)
> return -ENOMEM;
>
> - mlx5_query_nic_vport_context(mdev, 0, out);
> + err = mlx5_query_nic_vport_context(mdev, 0, out);
> + if (err)
> + goto out;
>
> *qkey_viol_cntr = MLX5_GET(query_nic_vport_context_out, out,
> nic_vport_context.qkey_violation_counter);
> -
> +out:
> kvfree(out);
>
> - return 0;
> + return err;
> }
> EXPORT_SYMBOL_GPL(mlx5_query_nic_vport_qkey_viol_cntr);
>

Reviewed-by: Tariq Toukan <tariqt@nvidia.com>

Thanks.