diff options
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/CVE-2020-15469-8.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/CVE-2020-15469-8.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2020-15469-8.patch b/meta/recipes-devtools/qemu/qemu/CVE-2020-15469-8.patch new file mode 100644 index 0000000000..7857ba266e --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2020-15469-8.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | From 735754aaa15a6ed46db51fd731e88331c446ea54 Mon Sep 17 00:00:00 2001 | ||
2 | From: Prasad J Pandit <pjp@fedoraproject.org> | ||
3 | Date: Tue, 11 Aug 2020 17:11:32 +0530 | ||
4 | Subject: [PATCH] imx7-ccm: add digprog mmio write method | ||
5 | |||
6 | Add digprog mmio write method to avoid assert failure during | ||
7 | initialisation. | ||
8 | |||
9 | Reviewed-by: Li Qiang <liq3ea@gmail.com> | ||
10 | Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org> | ||
11 | Message-Id: <20200811114133.672647-9-ppandit@redhat.com> | ||
12 | Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> | ||
13 | |||
14 | CVE: CVE-2020-15469 | ||
15 | Upstream-Status: Backport [import from ubuntu https://git.launchpad.net/ubuntu/+source/qemu/tree/debian/patches/CVE-2020-15469-8.patch?h=ubuntu/focal-security Upstream commit https://github.com/qemu/qemu/commit/735754aaa15a6ed46db51fd731e88331c446ea54] | ||
16 | Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> | ||
17 | --- | ||
18 | hw/misc/imx7_ccm.c | 8 ++++++++ | ||
19 | 1 file changed, 8 insertions(+) | ||
20 | |||
21 | diff --git a/hw/misc/imx7_ccm.c b/hw/misc/imx7_ccm.c | ||
22 | index 02fc1ae..075159e 100644 | ||
23 | --- a/hw/misc/imx7_ccm.c | ||
24 | +++ b/hw/misc/imx7_ccm.c | ||
25 | @@ -131,8 +131,16 @@ static const struct MemoryRegionOps imx7_set_clr_tog_ops = { | ||
26 | }, | ||
27 | }; | ||
28 | |||
29 | +static void imx7_digprog_write(void *opaque, hwaddr addr, | ||
30 | + uint64_t data, unsigned size) | ||
31 | +{ | ||
32 | + qemu_log_mask(LOG_GUEST_ERROR, | ||
33 | + "Guest write to read-only ANALOG_DIGPROG register\n"); | ||
34 | +} | ||
35 | + | ||
36 | static const struct MemoryRegionOps imx7_digprog_ops = { | ||
37 | .read = imx7_set_clr_tog_read, | ||
38 | + .write = imx7_digprog_write, | ||
39 | .endianness = DEVICE_NATIVE_ENDIAN, | ||
40 | .impl = { | ||
41 | .min_access_size = 4, | ||
42 | -- | ||
43 | 1.8.3.1 | ||
44 | |||