From: Colin Ian King Date: Thu, 16 Jan 2025 18:17:00 +0000 (+0000) Subject: net/mlx5: fix unintentional sign extension on shift of dest_attr->vport.vhca_id X-Git-Tag: v6.14-rc1~162^2~31 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=41c5d104f338b21b98aee5a207336c281325583f;p=thirdparty%2Flinux.git net/mlx5: fix unintentional sign extension on shift of dest_attr->vport.vhca_id Shifting dest_attr->vport.vhca_id << 16 results in a promotion from an unsigned 16 bit integer to a 32 bit signed integer, this is then sign extended to a 64 bit unsigned long on 64 bitarchitectures. If vhca_id is greater than 0x7fff then this leads to a sign extended result where all the upper 32 bits of idx are set to 1. Fix this by casting vhca_id to the same type as idx before performing the shift. Fixes: 8e2e08a6d1e0 ("net/mlx5: fs, add support for dest vport HWS action") Signed-off-by: Colin Ian King Reviewed-by: Simon Horman Acked-by: Moshe Shemesh Link: https://patch.msgid.link/20250116181700.96437-1-colin.i.king@gmail.com Signed-off-by: Jakub Kicinski --- diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c index 05329afeb9ea2..f34bbbbba1c2a 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c @@ -417,7 +417,7 @@ mlx5_fs_get_dest_action_vport(struct mlx5_fs_hws_context *fs_ctx, vport_num = is_dest_type_uplink ? MLX5_VPORT_UPLINK : dest_attr->vport.num; if (vhca_id_valid) { dests_xa = &fs_ctx->hws_pool.vport_vhca_dests; - idx = dest_attr->vport.vhca_id << 16 | vport_num; + idx = (unsigned long)dest_attr->vport.vhca_id << 16 | vport_num; } else { dests_xa = &fs_ctx->hws_pool.vport_dests; idx = vport_num;