RDMA/mlx5: Check the DM type before mapping a MEMIC operation
Subsystems (2)
PATCH 1/1 RDMA/mlx5: Check the DM type before mapping a MEMIC operation
MLX5_IB_METHOD_DM_MAP_OP_ADDR accepts a handle to any DM object and converts it with to_memic() without checking the DM type. The handle can refer to a SW ICM object, which is a struct mlx5_ib_dm_icm and is smaller than struct mlx5_ib_dm_memic.
The handler then uses the ops_xa_lock, ops and ref members, which are all located past the end of the mlx5_ib_dm_icm allocation, so it locks and modifies memory that belongs to other slab objects.
Return -EOPNOTSUPP for DM objects that are not MEMIC, as MLX5_IB_METHOD_DM_QUERY already does.
--- drivers/infiniband/hw/mlx5/dm.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/infiniband/hw/mlx5/dm.c +3 -0
@@ -213,6 +213,9 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DM_MAP_OP_ADDR)(int err;u8 op; +if (dm->base.type !=MLX5_IB_UAPI_DM_TYPE_MEMIC ) +return -EOPNOTSUPP ; + err =uverbs_copy_from (&op, attrs,MLX5_IB_ATTR_DM_MAP_OP_ADDR_REQ_OP );if (err)return err;
Signature · 1 line
2.43.0
[email protected]
AI reviewSashiko has reviewed this patch and found no issues.
Quoted 9 lines
MLX5_IB_METHOD_DM_MAP_OP_ADDRaccepts a handle to any DM object and converts it withto_memic()without checking the DM type. The handle can refer to a SW ICM object, which is a structmlx5_ib_dm_icmand is smaller than structmlx5_ib_dm_memic.The handler then uses the
ops_xa_lock, ops and ref members, which are all located past the end of themlx5_ib_dm_icmallocation, so it locks and modifies memory that belongs to other slab objects.
Quoted 6 lines
Return
-EOPNOTSUPPfor DM objects that are not MEMIC, asMLX5_IB_METHOD_DM_QUERYalready does.Fixes cea85fa5dbc2 ("RDMA/mlx5: Add support in MEMIC operations")Signed-off-by Hungyu Lin <[email protected]>
Sashiko has reviewed this patch and found no issues.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Quoted 24 lines · Hungyu Lin
MLX5_IB_METHOD_DM_MAP_OP_ADDRaccepts a handle to any DM object and converts it withto_memic()without checking the DM type. The handle can refer to a SW ICM object, which is a structmlx5_ib_dm_icmand is smaller than structmlx5_ib_dm_memic.The handler then uses the
ops_xa_lock, ops and ref members, which are all located past the end of themlx5_ib_dm_icmallocation, so it locks and modifies memory that belongs to other slab objects.Return
-EOPNOTSUPPfor DM objects that are not MEMIC, asMLX5_IB_METHOD_DM_QUERYalready does.Fixes cea85fa5dbc2 ("RDMA/mlx5: Add support in MEMIC operations")Signed-off-by Hungyu Lin <[email protected]>--- drivers/infiniband/hw/mlx5/dm.c | 3 +++ 1 file changed, 3 insertions(+)drivers/infiniband/hw/mlx5/dm.c +0
-0
drivers/infiniband/hw/mlx5/dm.c static int UVERBS_HANDLER(MLX5_IB_METHOD_DM_MAP_OP_ADDR)( · line 221
Quoted 9 lines
drivers/infiniband/hw/mlx5/dm.c +3
-0@@ -213,6 +213,9 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DM_MAP_OP_ADDR)(int err;u8 op; +if (dm->base.type !=MLX5_IB_UAPI_DM_TYPE_MEMIC ) +return -EOPNOTSUPP ; + err =uverbs_copy_from (&op, attrs,MLX5_IB_ATTR_DM_MAP_OP_ADDR_REQ_OP );if (err)return err;
I applied this patch with the following change:
drivers/infiniband/hw/mlx5/dm.c +2 -1
@@ -208,12 +208,13 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DM_MAP_OP_ADDR)( attrs, MLX5_IB_ATTR_DM_MAP_OP_ADDR_REQ_HANDLE);struct mlx5_ib_dev *dev =to_mdev (uobj->context->device);struct ib_dm *ibdm = uobj->object; +struct mlx5_ib_dm *mdm =to_mdm (ibdm);struct mlx5_ib_dm_memic *dm =to_memic (ibdm);struct mlx5_ib_dm_op_entry *op_entry;int err;u8 op; -if (dm->base.type !=MLX5_IB_UAPI_DM_TYPE_MEMIC ) +if (mdm->base.type !=MLX5_IB_UAPI_DM_TYPE_MEMIC )return -EOPNOTSUPP ; err =uverbs_copy_from (&op, attrs,MLX5_IB_ATTR_DM_MAP_OP_ADDR_REQ_OP );
Thanks
Quoted 2 lines
Signature · 1 line
2.43.0
Leon Romanovsky
AppliedQuoted 10 lines · Hungyu Lin
MLX5_IB_METHOD_DM_MAP_OP_ADDRaccepts a handle to any DM object and converts it withto_memic()without checking the DM type. The handle can refer to a SW ICM object, which is a structmlx5_ib_dm_icmand is smaller than structmlx5_ib_dm_memic.The handler then uses the
ops_xa_lock, ops and ref members, which are all located past the end of themlx5_ib_dm_icmallocation, so it locks and modifies memory that belongs to other slab objects.[...]
Applied, thanks!
[1/1] RDMA/mlx5: Check the DM type before mapping a MEMIC operation
https://git.kernel.org/rdma/rdma/c/ea97d0a83f4ed6
Best regards,
Signature · 1 line
Leon Romanovsky <[email protected]>