RDMA/irdma: Fix potential overflow expression in irdma_prm_get_pbles

Coverity reports a signed 32-bit overflow on "1 << pprm->pble_shift" when
used expression to compute bits_needed that expects 64bit, unsigned.

Fix this by using the 1ULL in the left shift operator and convert mem_size
to u64.

Link: https://lore.kernel.org/r/20210625162329.1654-3-tatyana.e.nikolova@intel.com
Reported-by: coverity-bot <keescook+coverity-bot@chromium.org>
Addresses-Coverity-ID: 1505157 ("Integer handling issues")
Fixes: 915cc7ac0f8e ("RDMA/irdma: Add miscellaneous utility definitions")
Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com>
Signed-off-by: Tatyana Nikolova <tatyana.e.nikolova@intel.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

diff --git a/drivers/infiniband/hw/irdma/pble.h b/drivers/infiniband/hw/irdma/pble.h
index e4e635dc4fd9f08baf932e640d59b9d7015b024d..e1b3b8118a2ca4cd2d348f6c0c4414ddc2b95ca4 100644 (file)
--- a/drivers/infiniband/hw/irdma/pble.h
+++ b/drivers/infiniband/hw/irdma/pble.h
@@ -121,7 +121,7 @@ enum irdma_status_code irdma_prm_add_pble_mem(struct irdma_pble_prm *pprm,
                                              struct irdma_chunk *pchunk);
 enum irdma_status_code
 irdma_prm_get_pbles(struct irdma_pble_prm *pprm,
-                   struct irdma_pble_chunkinfo *chunkinfo, u32 mem_size,
+                   struct irdma_pble_chunkinfo *chunkinfo, u64 mem_size,
                    u64 **vaddr, u64 *fpm_addr);
 void irdma_prm_return_pbles(struct irdma_pble_prm *pprm,
                            struct irdma_pble_chunkinfo *chunkinfo);

diff --git a/drivers/infiniband/hw/irdma/utils.c b/drivers/infiniband/hw/irdma/utils.c
index ea1df5918c11c2e45f31dff689b8fe200a14281c..5bbe44e54f9a11f3c58fb50a2a42542d7680c479 100644 (file)
--- a/drivers/infiniband/hw/irdma/utils.c
+++ b/drivers/infiniband/hw/irdma/utils.c
@@ -2314,7 +2314,7 @@ enum irdma_status_code irdma_prm_add_pble_mem(struct irdma_pble_prm *pprm,
  */
 enum irdma_status_code
 irdma_prm_get_pbles(struct irdma_pble_prm *pprm,
-                   struct irdma_pble_chunkinfo *chunkinfo, u32 mem_size,
+                   struct irdma_pble_chunkinfo *chunkinfo, u64 mem_size,
                    u64 **vaddr, u64 *fpm_addr)
 {
        u64 bits_needed;
@@ -2326,7 +2326,7 @@ irdma_prm_get_pbles(struct irdma_pble_prm *pprm,
        *vaddr = NULL;
        *fpm_addr = 0;
 
-       bits_needed = (mem_size + (1 << pprm->pble_shift) - 1) >> pprm->pble_shift;
+       bits_needed = DIV_ROUND_UP_ULL(mem_size, BIT_ULL(pprm->pble_shift));
 
        spin_lock_irqsave(&pprm->prm_lock, flags);
        while (chunk_entry != &pprm->clist) {