hw/rdma: Fix possible mremap overflow in the pvrdma device (CVE-2021-3582)
PATCH 1/1 hw/rdma: Fix possible mremap overflow in the pvrdma device (CVE-2021-3582)
From: Marcel Apfelbaum <[email protected]>
Ensure mremap boundaries not trusting the guest kernel to pass the correct buffer length.
Fixes CVE-2021-3582
Reported-by VictorV (Kunlun Lab) <[email protected]>
Tested-by VictorV (Kunlun Lab) <[email protected]>
Signed-off-by Marcel Apfelbaum <[email protected]>
--- hw/rdma/vmw/pvrdma_cmd.c | 6 ++++++ 1 file changed, 6 insertions(+)
hw/rdma/vmw/pvrdma_cmd.c +6 -0
@@ -38,6 +38,12 @@ 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, 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" );
Signature · 1 line
2.17.2
Quoted 9 lines · Marcel Apfelbaum
From: Marcel Apfelbaum <[email protected]>
hw/rdma/vmw/pvrdma_cmd.c +0
-0@@ -38,6 +38,12 @@ static void *pvrdma_map_to_pdir(PCIDevice *pdev, uint64_t pdir_dma, return NULL; }
hw/rdma/vmw/pvrdma_cmd.c static void *pvrdma_map_to_pdir(PCIDevice *pdev, uint64_t pdir_dma, · line 49
Quoted 10 lines
hw/rdma/vmw/pvrdma_cmd.c +6
-0+ length = ROUND_UP(length, TARGET_PAGE_SIZE); + if (nchunks * TARGET_PAGE_SIZE != length) { + rdma_error_report("Invalid nchunks/length (%u, %lu)", nchunks, 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");
Looks okay.
Reviewed-by Prasad J Pandit <[email protected]>
Thank you.
---
-P J P
http://feedmug.com
Reviewed-by Yuval Shaia <[email protected]>
Tested-by Yuval Shaia <[email protected]>
Quoted 36 lines · Marcel Apfelbaum
From: Marcel Apfelbaum <[email protected]>
Ensure mremap boundaries not trusting the guest kernel to pass the correct buffer length.
Fixes CVE-2021-3582Reported-by VictorV (Kunlun Lab) <[email protected]>Tested-by VictorV (Kunlun Lab) <[email protected]>Signed-off-by Marcel Apfelbaum <[email protected]>--- hw/rdma/vmw/pvrdma_cmd.c | 6 ++++++ 1 file changed, 6 insertions(+)hw/rdma/vmw/pvrdma_cmd.c +6
-0@@ -38,6 +38,12 @@ 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, 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");--
2.17.2