Skip to contentSkip to conversation

pvrdma: Ensure correct input on ring init (CVE-2021-3607)

PATCH In review Marcel Apfelbaum 2 participants 2 messages Jun 30, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pvrdma: Ensure correct input on ring init (CVE-2021-3607)

Check the guest passed a non zero page count
for pvrdma device ring buffers.

---
 hw/rdma/vmw/pvrdma_main.c | 5 +++++
 1 file changed, 5 insertions(+)
hw/rdma/vmw/pvrdma_main.c +5 -0
index 84ae8024fc..7c0c3551a8 100644
@@ -92,6 +92,11 @@ static int init_dev_ring(PvrdmaRing *ring, PvrdmaRingState **ring_state,
     uint64_t *dir, *tbl;
     int rc = 0;
 
+    if (!num_pages) {
+        rdma_error_report("Ring pages count must be strictly positive");
+        return -EINVAL;
+    }
+
     dir = rdma_pci_dma_map(pci_dev, dir_addr, TARGET_PAGE_SIZE);
     if (!dir) {
         rdma_error_report("Failed to map to page directory (ring %s)", name);
Signature · 1 line
2.31.1
Reviewed-by Tested-by on v1 1/1
#1 lore raw
Quoted 16 lines · Marcel Apfelbaum

Check the guest passed a non zero page count
for pvrdma device ring buffers.

---
 hw/rdma/vmw/pvrdma_main.c | 5 +++++
 1 file changed, 5 insertions(+)
hw/rdma/vmw/pvrdma_main.c +0 -0
index 84ae8024fc..7c0c3551a8 100644

hw/rdma/vmw/pvrdma_main.c static int init_dev_ring(PvrdmaRing *ring, · line 101

Quoted 10 lines
hw/rdma/vmw/pvrdma_main.c +5 -0
@@ -92,6 +92,11 @@ static int init_dev_ring(PvrdmaRing *ring,
 PvrdmaRingState **ring_state,
     uint64_t *dir, *tbl;
     int rc = 0;
 
+    if (!num_pages) {
+        rdma_error_report("Ring pages count must be strictly positive");
+        return -EINVAL;
+    }
+
 
Quoted 8 lines
hw/rdma/vmw/pvrdma_main.c +0 -0
     dir = rdma_pci_dma_map(pci_dev, dir_addr, TARGET_PAGE_SIZE);

if (!dir) {
rdma_error_report("Failed to map to page directory (ring %s)",
name);
--
2.31.1