[PATCH 5.10 340/663] IB/cm: Avoid a loop when device has 255 ports

[Greg Kroah-Hartman]

From: Parav Pandit <pa...@nvidia.com>

[ Upstream commit 131be26750379592f0dd6244b2a90bbb504a10bb ]

When RDMA device has 255 ports, loop iterator i overflows.  Due to which
cm_add_one() port iterator loops infinitely.  Use core provided port
iterator to avoid the infinite loop.

Fixes: a977049dacde ("[PATCH] IB: Add the kernel CM implementation")
Link: https://lore.kernel.org/r/20210127150010.1876121-9-l...@kernel.org
Signed-off-by: Mark Bloch <mbl...@nvidia.com>
Signed-off-by: Parav Pandit <pa...@nvidia.com>
Signed-off-by: Leon Romanovsky <leo...@nvidia.com>
Signed-off-by: Jason Gunthorpe <j...@nvidia.com>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/infiniband/core/cm.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index 5afd142fe8c78..8e578f73a074c 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -4332,7 +4332,7 @@ static int cm_add_one(struct ib_device *ib_device)
        unsigned long flags;
        int ret;
        int count = 0;
-       u8 i;
+       unsigned int i;
 
        cm_dev = kzalloc(struct_size(cm_dev, port, ib_device->phys_port_cnt),
                         GFP_KERNEL);
@@ -4344,7 +4344,7 @@ static int cm_add_one(struct ib_device *ib_device)
        cm_dev->going_down = 0;
 
        set_bit(IB_MGMT_METHOD_SEND, reg_req.method_mask);
-       for (i = 1; i <= ib_device->phys_port_cnt; i++) {
+       rdma_for_each_port (ib_device, i) {
                if (!rdma_cap_ib_cm(ib_device, i))
                        continue;
 
@@ -4430,7 +4430,7 @@ static void cm_remove_one(struct ib_device *ib_device, 
void *client_data)
                .clr_port_cap_mask = IB_PORT_CM_SUP
        };
        unsigned long flags;
-       int i;
+       unsigned int i;
 
        write_lock_irqsave(&cm.device_lock, flags);
        list_del(&cm_dev->list);
@@ -4440,7 +4440,7 @@ static void cm_remove_one(struct ib_device *ib_device, 
void *client_data)
        cm_dev->going_down = 1;
        spin_unlock_irq(&cm.lock);
 
-       for (i = 1; i <= ib_device->phys_port_cnt; i++) {
+       rdma_for_each_port (ib_device, i) {
                if (!rdma_cap_ib_cm(ib_device, i))
                        continue;
 
-- 
2.27.0