Commit 2a0e6f13 authored by Prasad J Pandit's avatar Prasad J Pandit Committed by Michael Roth
Browse files

pvrdma: check number of pages when creating rings 



When creating CQ/QP rings, an object can have up to
PVRDMA_MAX_FAST_REG_PAGES 8 pages. Check 'npages' parameter
to avoid excessive memory allocation or a null dereference.

Reported-by: default avatarLi Qiang <liq3ea@163.com>
Signed-off-by: default avatarPrasad J Pandit <pjp@fedoraproject.org>
Reviewed-by: default avatarYuval Shaia <yuval.shaia@oracle.com>
Signed-off-by: default avatarMarcel Apfelbaum <marcel.apfelbaum@gmail.com>
(cherry picked from commit 2c858ce5)
Signed-off-by: default avatarMichael Roth <mdroth@linux.vnet.ibm.com>
parent 017f271f

hw/rdma/vmw/pvrdma_cmd.c

+11 −0
Original line number Diff line number Diff line
@@ -261,6 +261,11 @@ static int create_cq_ring(PCIDevice *pci_dev , PvrdmaRing **ring, 
    int rc = -EINVAL;

    char ring_name[MAX_RING_NAME_SZ];



    if (!nchunks || nchunks > PVRDMA_MAX_FAST_REG_PAGES) {

        pr_dbg("invalid nchunks: %d\n", nchunks);

        return rc;

    }



    pr_dbg("pdir_dma=0x%llx\n", (long long unsigned int)pdir_dma);

    dir = rdma_pci_dma_map(pci_dev, pdir_dma, TARGET_PAGE_SIZE);

    if (!dir) {
@@ -377,6 +382,12 @@ static int create_qp_rings(PCIDevice *pci_dev, uint64_t pdir_dma, 
    char ring_name[MAX_RING_NAME_SZ];

    uint32_t wqe_sz;



    if (!spages || spages > PVRDMA_MAX_FAST_REG_PAGES

        || !rpages || rpages > PVRDMA_MAX_FAST_REG_PAGES) {

        pr_dbg("invalid pages: %d, %d\n", spages, rpages);

        return rc;

    }



    pr_dbg("pdir_dma=0x%llx\n", (long long unsigned int)pdir_dma);

    dir = rdma_pci_dma_map(pci_dev, pdir_dma, TARGET_PAGE_SIZE);

    if (!dir) {