]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net/mlx5_core: Add error handling inmlx5_query_nic_vport_qkey_viol_cntr()
authorWentao Liang <vulab@iscas.ac.cn>
Wed, 21 May 2025 13:36:20 +0000 (21:36 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Jun 2025 10:04:11 +0000 (11:04 +0100)
commit f0b50730bdd8f2734e548de541e845c0d40dceb6 upstream.

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
Signed-off-by: Wentao Liang <vulab@iscas.ac.cn>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Link: https://patch.msgid.link/20250521133620.912-1-vulab@iscas.ac.cn
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/ethernet/mellanox/mlx5/core/vport.c

index e77cf11356c0752826cead407770b96df7b7ecac..b68dd959915aa0953c42a3abac9e302dd5ee79f6 100644 (file)
@@ -494,19 +494,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);