diff options
| author |   Kai Kang <kai.kang@windriver.com> | 2019-03-15 04:01:19 -0400 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-03-19 10:46:15 +0000 |
| commit | 489ece1aa90d8f76b4c1f009d837f82e38e11ba9 (patch) | |
| tree | 4b1fcd47eaef0be15b2320e95ca2eb52452ffce0 /meta/recipes-devtools/qemu/qemu/0018-fix-CVE-2018-20191.patch | |
| parent | f24178993e7b0830510900e80e879c7f9f8e28f0 (diff) | |
| download | openembedded-core-contrib-489ece1aa90d8f76b4c1f009d837f82e38e11ba9.tar.gz | |
qemu: backport patches to fix cves
CVE: CVE-2018-16872
CVE: CVE-2018-20124
CVE: CVE-2018-20125
CVE: CVE-2018-20126
CVE: CVE-2018-20191
CVE: CVE-2018-20216
Patches 0015-fix-CVE-2018-20124.patch and 0017-fix-CVE-2018-20126.patch
are rebased on current source code. Others are not modified.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/0018-fix-CVE-2018-20191.patch')
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu/0018-fix-CVE-2018-20191.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/0018-fix-CVE-2018-20191.patch b/meta/recipes-devtools/qemu/qemu/0018-fix-CVE-2018-20191.patch new file mode 100644 index 0000000000..8f8ff0567a --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/0018-fix-CVE-2018-20191.patch @@ -0,0 +1,47 @@ +CVE: CVE-2018-20191 +Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commit;h=2aa8645] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> + +From 2aa86456fb938a11f2b7bd57c8643c213218681c Mon Sep 17 00:00:00 2001 +From: Prasad J Pandit <pjp@fedoraproject.org> +Date: Thu, 13 Dec 2018 01:00:35 +0530 +Subject: [PATCH] pvrdma: add uar_read routine + +Define skeleton 'uar_read' routine. Avoid NULL dereference. + +Reported-by: Li Qiang <liq3ea@163.com> +Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org> +Reviewed-by: Marcel Apfelbaum <marcel.apfelbaum@gmail.com> +Signed-off-by: Marcel Apfelbaum <marcel.apfelbaum@gmail.com> +--- + hw/rdma/vmw/pvrdma_main.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c +index 64de16fb52..838ad8a949 100644 +--- a/hw/rdma/vmw/pvrdma_main.c ++++ b/hw/rdma/vmw/pvrdma_main.c +@@ -448,6 +448,11 @@ static const MemoryRegionOps regs_ops = { + }, + }; + ++static uint64_t uar_read(void *opaque, hwaddr addr, unsigned size) ++{ ++ return 0xffffffff; ++} ++ + static void uar_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) + { + PVRDMADev *dev = opaque; +@@ -489,6 +494,7 @@ static void uar_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) + } + + static const MemoryRegionOps uar_ops = { ++ .read = uar_read, + .write = uar_write, + .endianness = DEVICE_LITTLE_ENDIAN, + .impl = { +-- +2.20.1 + |