diff options
author | Sakib Sajal <sakib.sajal@windriver.com> | 2021-08-24 11:18:29 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-01 16:27:09 +0100 |
commit | f63635a30da4b8e91efa5fc9cdbe85c902dce269 (patch) | |
tree | 99c82f80674639f1ddbe46ec0beea4a2fa092138 /meta/recipes-devtools/qemu | |
parent | d56b8f6f762f8aab5c4972aaca4704a3e43755dc (diff) | |
download | poky-f63635a30da4b8e91efa5fc9cdbe85c902dce269.tar.gz |
qemu: fix CVE-2021-3582
Source: http://git.yoctoproject.org/cgit/poky.git
MR: 112743
Type: Security Fix
Disposition: Backport from http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/meta/recipes-devtools/qemu?h=hardknott&id=e11384737ed489ea02800d545432b9ded82bf1bb
ChangeID: a2ff7112354349e8cf8960f30499f61e545d7f8e
Description:
(From OE-Core rev: fb2634922db91e5b877dd10021dafec7b5c6e565)
(From OE-Core rev: 942d936524d3948d74c7240038ce81d859f68cab)
Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit e11384737ed489ea02800d545432b9ded82bf1bb)
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu.inc | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/CVE-2021-3582.patch | 47 |
2 files changed, 48 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 78e487fc6f..854a907216 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc | |||
@@ -81,6 +81,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ | |||
81 | file://CVE-2021-3546.patch \ | 81 | file://CVE-2021-3546.patch \ |
82 | file://CVE-2021-3527-1.patch \ | 82 | file://CVE-2021-3527-1.patch \ |
83 | file://CVE-2021-3527-2.patch \ | 83 | file://CVE-2021-3527-2.patch \ |
84 | file://CVE-2021-3582.patch \ | ||
84 | " | 85 | " |
85 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" | 86 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" |
86 | 87 | ||
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2021-3582.patch b/meta/recipes-devtools/qemu/qemu/CVE-2021-3582.patch new file mode 100644 index 0000000000..7a88e29384 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2021-3582.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | From 284f191b4abad213aed04cb0458e1600fd18d7c4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Marcel Apfelbaum <marcel@redhat.com> | ||
3 | Date: Wed, 16 Jun 2021 14:06:00 +0300 | ||
4 | Subject: [PATCH] hw/rdma: Fix possible mremap overflow in the pvrdma device | ||
5 | (CVE-2021-3582) | ||
6 | |||
7 | Ensure mremap boundaries not trusting the guest kernel to | ||
8 | pass the correct buffer length. | ||
9 | |||
10 | Fixes: CVE-2021-3582 | ||
11 | Reported-by: VictorV (Kunlun Lab) <vv474172261@gmail.com> | ||
12 | Tested-by: VictorV (Kunlun Lab) <vv474172261@gmail.com> | ||
13 | Signed-off-by: Marcel Apfelbaum <marcel@redhat.com> | ||
14 | Message-Id: <20210616110600.20889-1-marcel.apfelbaum@gmail.com> | ||
15 | Reviewed-by: Yuval Shaia <yuval.shaia.ml@gmail.com> | ||
16 | Tested-by: Yuval Shaia <yuval.shaia.ml@gmail.com> | ||
17 | Reviewed-by: Prasad J Pandit <pjp@fedoraproject.org> | ||
18 | Signed-off-by: Marcel Apfelbaum <marcel.apfelbaum@gmail.com> | ||
19 | |||
20 | CVE: CVE-2021-3582 | ||
21 | Upstream-Status: Backport [284f191b4abad213aed04cb0458e1600fd18d7c4] | ||
22 | Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> | ||
23 | --- | ||
24 | hw/rdma/vmw/pvrdma_cmd.c | 7 +++++++ | ||
25 | 1 file changed, 7 insertions(+) | ||
26 | |||
27 | diff --git a/hw/rdma/vmw/pvrdma_cmd.c b/hw/rdma/vmw/pvrdma_cmd.c | ||
28 | index f59879e257..da7ddfa548 100644 | ||
29 | --- a/hw/rdma/vmw/pvrdma_cmd.c | ||
30 | +++ b/hw/rdma/vmw/pvrdma_cmd.c | ||
31 | @@ -38,6 +38,13 @@ static void *pvrdma_map_to_pdir(PCIDevice *pdev, uint64_t pdir_dma, | ||
32 | return NULL; | ||
33 | } | ||
34 | |||
35 | + length = ROUND_UP(length, TARGET_PAGE_SIZE); | ||
36 | + if (nchunks * TARGET_PAGE_SIZE != length) { | ||
37 | + rdma_error_report("Invalid nchunks/length (%u, %lu)", nchunks, | ||
38 | + (unsigned long)length); | ||
39 | + return NULL; | ||
40 | + } | ||
41 | + | ||
42 | dir = rdma_pci_dma_map(pdev, pdir_dma, TARGET_PAGE_SIZE); | ||
43 | if (!dir) { | ||
44 | rdma_error_report("Failed to map to page directory"); | ||
45 | -- | ||
46 | 2.25.1 | ||
47 | |||