]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Revert "RDMA/mlx5: Fix integer overflow while resizing CQ"
authorDoug Ledford <dledford@redhat.com>
Fri, 9 Mar 2018 23:07:46 +0000 (18:07 -0500)
committerDoug Ledford <dledford@redhat.com>
Fri, 9 Mar 2018 23:07:46 +0000 (18:07 -0500)
The original commit of this patch has a munged log message that is
missing several of the tags the original author intended to be on the
patch.  This was due to patchworks misinterpreting a cut-n-paste
separator line as an end of message line and munging the mbox that was
used to import the patch:

https://patchwork.kernel.org/patch/10264089/

The original patch will be reapplied with a fixed commit message so the
proper tags are applied.

This reverts commit aa0de36a40f446f5a21a7c1e677b98206e242edb.

Signed-off-by: Doug Ledford <dledford@redhat.com>
drivers/infiniband/hw/mlx5/cq.c

index 15457c9569a778aae2a6d057f52e0672b651a115..b5cfdaa9c7c8c97d68d0ece8d41035f2d7879d51 100644 (file)
@@ -1178,12 +1178,7 @@ static int resize_user(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *cq,
        if (ucmd.reserved0 || ucmd.reserved1)
                return -EINVAL;
 
-       /* check multiplication overflow */
-       if (ucmd.cqe_size && SIZE_MAX / ucmd.cqe_size <= entries - 1)
-               return -EINVAL;
-
-       umem = ib_umem_get(context, ucmd.buf_addr,
-                          (size_t)ucmd.cqe_size * entries,
+       umem = ib_umem_get(context, ucmd.buf_addr, entries * ucmd.cqe_size,
                           IB_ACCESS_LOCAL_WRITE, 1);
        if (IS_ERR(umem)) {
                err = PTR_ERR(umem);