summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorMarcel Apfelbaum <marcel@redhat.com>2021-06-16 14:06:00 +0300
committerMarcel Apfelbaum <marcel.apfelbaum@gmail.com>2021-07-04 22:47:51 +0300
commit284f191b4abad213aed04cb0458e1600fd18d7c4 (patch)
tree747cba2bba7c7901205c8630d67eae03c8a2b340
parent9c2647f75004c4f7d64c9c0ec55f8c6f0739a8b1 (diff)
downloadfocaccia-qemu-284f191b4abad213aed04cb0458e1600fd18d7c4.tar.gz
focaccia-qemu-284f191b4abad213aed04cb0458e1600fd18d7c4.zip
hw/rdma: Fix possible mremap overflow in the pvrdma device (CVE-2021-3582)
Ensure mremap boundaries not trusting the guest kernel to
pass the correct buffer length.

Fixes: CVE-2021-3582
Reported-by: VictorV (Kunlun Lab) <vv474172261@gmail.com>
Tested-by: VictorV (Kunlun Lab) <vv474172261@gmail.com>
Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
Message-Id: <20210616110600.20889-1-marcel.apfelbaum@gmail.com>
Reviewed-by: Yuval Shaia <yuval.shaia.ml@gmail.com>
Tested-by: Yuval Shaia <yuval.shaia.ml@gmail.com>
Reviewed-by: Prasad J Pandit <pjp@fedoraproject.org>
Signed-off-by: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
-rw-r--r--hw/rdma/vmw/pvrdma_cmd.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/hw/rdma/vmw/pvrdma_cmd.c b/hw/rdma/vmw/pvrdma_cmd.c
index f59879e257..da7ddfa548 100644
--- a/hw/rdma/vmw/pvrdma_cmd.c
+++ b/hw/rdma/vmw/pvrdma_cmd.c
@@ -38,6 +38,13 @@ static void *pvrdma_map_to_pdir(PCIDevice *pdev, uint64_t pdir_dma,
         return NULL;
     }
 
+    length = ROUND_UP(length, TARGET_PAGE_SIZE);
+    if (nchunks * TARGET_PAGE_SIZE != length) {
+        rdma_error_report("Invalid nchunks/length (%u, %lu)", nchunks,
+                          (unsigned long)length);
+        return NULL;
+    }
+
     dir = rdma_pci_dma_map(pdev, pdir_dma, TARGET_PAGE_SIZE);
     if (!dir) {
         rdma_error_report("Failed to map to page directory");