[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH PULL 28/31] pvrdma: check number of pages when creat
From: |
Marcel Apfelbaum |
Subject: |
[Qemu-devel] [PATCH PULL 28/31] pvrdma: check number of pages when creating rings |
Date: |
Sat, 22 Dec 2018 11:50:33 +0200 |
From: Prasad J Pandit <address@hidden>
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: Li Qiang <address@hidden>
Signed-off-by: Prasad J Pandit <address@hidden>
Reviewed-by: Yuval Shaia <address@hidden>
Signed-off-by: Marcel Apfelbaum <address@hidden>
---
hw/rdma/vmw/pvrdma_cmd.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/hw/rdma/vmw/pvrdma_cmd.c b/hw/rdma/vmw/pvrdma_cmd.c
index 3b94545761..f236ac4795 100644
--- a/hw/rdma/vmw/pvrdma_cmd.c
+++ b/hw/rdma/vmw/pvrdma_cmd.c
@@ -259,6 +259,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) {
@@ -372,6 +377,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) {
--
2.17.1
- [Qemu-devel] [PATCH PULL 21/31] hw/pvrdma: Clean device's resource when system is shutdown, (continued)
- [Qemu-devel] [PATCH PULL 21/31] hw/pvrdma: Clean device's resource when system is shutdown, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 20/31] vl: Introduce shutdown_notifiers, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 22/31] hw/rdma: Do not use bitmap_zero_extend to free bitmap, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 27/31] pvrdma: add uar_read routine, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 26/31] rdma: check num_sge does not exceed MAX_SGE, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 31/31] pvrdma: check return value from pvrdma_idx_ring_has_ routines, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 23/31] hw/rdma: Do not call rdma_backend_del_gid on an empty gid, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 25/31] pvrdma: release device resources in case of an error, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 29/31] pvrdma: release ring object in case of an error, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 30/31] rdma: remove unused VENDOR_ERR_NO_SGE macro, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 28/31] pvrdma: check number of pages when creating rings,
Marcel Apfelbaum <=
- [Qemu-devel] [PATCH PULL 24/31] docs: Update pvrdma device documentation, Marcel Apfelbaum, 2018/12/22
- Re: [Qemu-devel] [PATCH PULL 00/31] RDMA queue, Peter Maydell, 2018/12/22