diff mbox series

[rdma-next,v2,1/1] RDMA/mana_ib: Fix integer overflow during queue creation

Message ID 1742312744-14370-1-git-send-email-kotaranov@linux.microsoft.com (mailing list archive)
State Accepted
Headers show
Series [rdma-next,v2,1/1] RDMA/mana_ib: Fix integer overflow during queue creation | expand

Commit Message

Konstantin Taranov March 18, 2025, 3:45 p.m. UTC 
From: Konstantin Taranov <kotaranov@microsoft.com>

Check queue size during CQ creation for users to prevent
overflow of u32.

Fixes: bec127e45d9f ("RDMA/mana_ib: create kernel-level CQs")
Signed-off-by: Konstantin Taranov <kotaranov@microsoft.com>
---
v2: Only check the size of user CQs

 drivers/infiniband/hw/mana/cq.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Long Li March 18, 2025, 5:37 p.m. UTC | #1 
> Subject: [PATCH rdma-next v2 1/1] RDMA/mana_ib: Fix integer overflow during
> queue creation
> 
> From: Konstantin Taranov <kotaranov@microsoft.com>
> 
> Check queue size during CQ creation for users to prevent overflow of u32.
> 
> Fixes: bec127e45d9f ("RDMA/mana_ib: create kernel-level CQs")
> Signed-off-by: Konstantin Taranov <kotaranov@microsoft.com>

Reviewed-by: Long Li <longli@microsoft.com>

> ---
> v2: Only check the size of user CQs
> 
>  drivers/infiniband/hw/mana/cq.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/infiniband/hw/mana/cq.c b/drivers/infiniband/hw/mana/cq.c
> index 5c325ef..0fc4e26 100644
> --- a/drivers/infiniband/hw/mana/cq.c
> +++ b/drivers/infiniband/hw/mana/cq.c
> @@ -39,7 +39,8 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct
> ib_cq_init_attr *attr,
> 
>  		is_rnic_cq = !!(ucmd.flags & MANA_IB_CREATE_RNIC_CQ);
> 
> -		if (!is_rnic_cq && attr->cqe > mdev->adapter_caps.max_qp_wr)
> {
> +		if ((!is_rnic_cq && attr->cqe > mdev->adapter_caps.max_qp_wr)
> ||
> +		    attr->cqe > U32_MAX / COMP_ENTRY_SIZE) {
>  			ibdev_dbg(ibdev, "CQE %d exceeding limit\n", attr->cqe);
>  			return -EINVAL;
>  		}
> --
> 2.43.0
Leon Romanovsky March 19, 2025, 8:39 a.m. UTC | #2 
On Tue, 18 Mar 2025 08:45:44 -0700, Konstantin Taranov wrote:
> Check queue size during CQ creation for users to prevent
> overflow of u32.
> 
> 

Applied, thanks!

[1/1] RDMA/mana_ib: Fix integer overflow during queue creation
      https://git.kernel.org/rdma/rdma/c/0c55174524227a

Best regards,
diff mbox series

Patch

diff --git a/drivers/infiniband/hw/mana/cq.c b/drivers/infiniband/hw/mana/cq.c
index 5c325ef..0fc4e26 100644
--- a/drivers/infiniband/hw/mana/cq.c
+++ b/drivers/infiniband/hw/mana/cq.c
@@ -39,7 +39,8 @@  int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
 
 		is_rnic_cq = !!(ucmd.flags & MANA_IB_CREATE_RNIC_CQ);
 
-		if (!is_rnic_cq && attr->cqe > mdev->adapter_caps.max_qp_wr) {
+		if ((!is_rnic_cq && attr->cqe > mdev->adapter_caps.max_qp_wr) ||
+		    attr->cqe > U32_MAX / COMP_ENTRY_SIZE) {
 			ibdev_dbg(ibdev, "CQE %d exceeding limit\n", attr->cqe);
 			return -EINVAL;
 		}