diff options
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/CVE-2020-15469-7.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/CVE-2020-15469-7.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2020-15469-7.patch b/meta/recipes-devtools/qemu/qemu/CVE-2020-15469-7.patch new file mode 100644 index 0000000000..7d8ec32251 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2020-15469-7.patch | |||
@@ -0,0 +1,50 @@ | |||
1 | From 2c9fb3b784000c1df32231e1c2464bb2e3fc4620 Mon Sep 17 00:00:00 2001 | ||
2 | From: Prasad J Pandit <pjp@fedoraproject.org> | ||
3 | Date: Tue, 11 Aug 2020 17:11:31 +0530 | ||
4 | Subject: [PATCH] tz-ppc: add dummy read/write methods | ||
5 | |||
6 | Add tz-ppc-dummy mmio read/write methods to avoid assert failure | ||
7 | during initialisation. | ||
8 | |||
9 | Reviewed-by: Peter Maydell <peter.maydell@linaro.org> | ||
10 | Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org> | ||
11 | Reviewed-by: Li Qiang <liq3ea@gmail.com> | ||
12 | Message-Id: <20200811114133.672647-8-ppandit@redhat.com> | ||
13 | Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> | ||
14 | |||
15 | CVE: CVE-2020-15469 | ||
16 | Upstream-Status: Backport [import from ubuntu https://git.launchpad.net/ubuntu/+source/qemu/tree/debian/patches/CVE-2020-15469-7.patch?h=ubuntu/focal-security Upstream commit https://github.com/qemu/qemu/commit/2c9fb3b784000c1df32231e1c2464bb2e3fc4620 ] | ||
17 | Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> | ||
18 | --- | ||
19 | hw/misc/tz-ppc.c | 14 ++++++++++++++ | ||
20 | 1 file changed, 14 insertions(+) | ||
21 | |||
22 | diff --git a/hw/misc/tz-ppc.c b/hw/misc/tz-ppc.c | ||
23 | index 6431257..36495c6 100644 | ||
24 | --- a/hw/misc/tz-ppc.c | ||
25 | +++ b/hw/misc/tz-ppc.c | ||
26 | @@ -196,7 +196,21 @@ static bool tz_ppc_dummy_accepts(void *opaque, hwaddr addr, | ||
27 | g_assert_not_reached(); | ||
28 | } | ||
29 | |||
30 | +static uint64_t tz_ppc_dummy_read(void *opaque, hwaddr addr, unsigned size) | ||
31 | +{ | ||
32 | + g_assert_not_reached(); | ||
33 | +} | ||
34 | + | ||
35 | +static void tz_ppc_dummy_write(void *opaque, hwaddr addr, | ||
36 | + uint64_t data, unsigned size) | ||
37 | +{ | ||
38 | + g_assert_not_reached(); | ||
39 | +} | ||
40 | + | ||
41 | static const MemoryRegionOps tz_ppc_dummy_ops = { | ||
42 | + /* define r/w methods to avoid assert failure in memory_region_init_io */ | ||
43 | + .read = tz_ppc_dummy_read, | ||
44 | + .write = tz_ppc_dummy_write, | ||
45 | .valid.accepts = tz_ppc_dummy_accepts, | ||
46 | }; | ||
47 | |||
48 | -- | ||
49 | 1.8.3.1 | ||
50 | |||