bc7b2dfda0
hw/rdma: Fix possible mremap overflow in the pvrdma device (CVE-2021-3582) pvrdma: Ensure correct input on ring init (CVE-2021-3607) pvrdma: Fix the ring init error flow (CVE-2021-3608) Signed-off-by: yezengruan <yezengruan@huawei.com>
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
From 0383586640e2c9712376c795d4d2ea27aadeed78 Mon Sep 17 00:00:00 2001
|
|
From: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
|
|
Date: Wed, 30 Jun 2021 14:46:34 +0300
|
|
Subject: [PATCH 2/3] pvrdma: Ensure correct input on ring init (CVE-2021-3607)
|
|
|
|
Check the guest passed a non zero page count
|
|
for pvrdma device ring buffers.
|
|
|
|
Fixes: CVE-2021-3607
|
|
Reported-by: VictorV (Kunlun Lab) <vv474172261@gmail.com>
|
|
Reviewed-by: VictorV (Kunlun Lab) <vv474172261@gmail.com>
|
|
Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
|
|
Message-Id: <20210630114634.2168872-1-marcel@redhat.com>
|
|
Reviewed-by: Yuval Shaia <yuval.shaia.ml@gmail.com>
|
|
Tested-by: Yuval Shaia <yuval.shaia.ml@gmail.com>
|
|
Signed-off-by: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
|
|
cherry-pick from: 32e5703cfea07c91e6e84bcb0313f633bb146534
|
|
Signed-off-by: yezengruan <yezengruan@huawei.com>
|
|
---
|
|
hw/rdma/vmw/pvrdma_main.c | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c
|
|
index adcf79cd63..1d9f84e89a 100644
|
|
--- a/hw/rdma/vmw/pvrdma_main.c
|
|
+++ b/hw/rdma/vmw/pvrdma_main.c
|
|
@@ -93,6 +93,11 @@ static int init_dev_ring(PvrdmaRing *ring, struct pvrdma_ring **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);
|
|
--
|
|
2.27.0
|
|
|