Commit 7b1b6d35 authored by Rongwei Liu's avatar Rongwei Liu Committed by Saeed Mahameed

net/mlx5: Check return status first when querying system_image_guid

When querying system_image_guid from firmware, we should check return
value first. The buffer content is valid only if query succeed.
Signed-off-by: default avatarRongwei Liu <rongweil@nvidia.com>
Reviewed-by: default avatarMark Bloch <mbloch@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 0e6f3ef4
...@@ -421,19 +421,21 @@ int mlx5_query_nic_vport_system_image_guid(struct mlx5_core_dev *mdev, ...@@ -421,19 +421,21 @@ int mlx5_query_nic_vport_system_image_guid(struct mlx5_core_dev *mdev,
{ {
u32 *out; u32 *out;
int outlen = MLX5_ST_SZ_BYTES(query_nic_vport_context_out); int outlen = MLX5_ST_SZ_BYTES(query_nic_vport_context_out);
int err;
out = kvzalloc(outlen, GFP_KERNEL); out = kvzalloc(outlen, GFP_KERNEL);
if (!out) if (!out)
return -ENOMEM; return -ENOMEM;
mlx5_query_nic_vport_context(mdev, 0, out); err = mlx5_query_nic_vport_context(mdev, 0, out);
if (err)
goto out;
*system_image_guid = MLX5_GET64(query_nic_vport_context_out, out, *system_image_guid = MLX5_GET64(query_nic_vport_context_out, out,
nic_vport_context.system_image_guid); nic_vport_context.system_image_guid);
out:
kvfree(out); kvfree(out);
return err;
return 0;
} }
EXPORT_SYMBOL_GPL(mlx5_query_nic_vport_system_image_guid); EXPORT_SYMBOL_GPL(mlx5_query_nic_vport_system_image_guid);
...@@ -1133,19 +1135,20 @@ EXPORT_SYMBOL_GPL(mlx5_nic_vport_unaffiliate_multiport); ...@@ -1133,19 +1135,20 @@ EXPORT_SYMBOL_GPL(mlx5_nic_vport_unaffiliate_multiport);
u64 mlx5_query_nic_system_image_guid(struct mlx5_core_dev *mdev) u64 mlx5_query_nic_system_image_guid(struct mlx5_core_dev *mdev)
{ {
int port_type_cap = MLX5_CAP_GEN(mdev, port_type); int port_type_cap = MLX5_CAP_GEN(mdev, port_type);
u64 tmp = 0; u64 tmp;
int err;
if (mdev->sys_image_guid) if (mdev->sys_image_guid)
return mdev->sys_image_guid; return mdev->sys_image_guid;
if (port_type_cap == MLX5_CAP_PORT_TYPE_ETH) if (port_type_cap == MLX5_CAP_PORT_TYPE_ETH)
mlx5_query_nic_vport_system_image_guid(mdev, &tmp); err = mlx5_query_nic_vport_system_image_guid(mdev, &tmp);
else else
mlx5_query_hca_vport_system_image_guid(mdev, &tmp); err = mlx5_query_hca_vport_system_image_guid(mdev, &tmp);
mdev->sys_image_guid = tmp; mdev->sys_image_guid = err ? 0 : tmp;
return tmp; return mdev->sys_image_guid;
} }
EXPORT_SYMBOL_GPL(mlx5_query_nic_system_image_guid); EXPORT_SYMBOL_GPL(mlx5_query_nic_system_image_guid);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment