diff options
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/CVE-2020-12829_3.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/CVE-2020-12829_3.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2020-12829_3.patch b/meta/recipes-devtools/qemu/qemu/CVE-2020-12829_3.patch new file mode 100644 index 0000000000..c647028cfe --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2020-12829_3.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | From 2824809b7f8f03ddc6e2b7e33e78c06022424298 Mon Sep 17 00:00:00 2001 | ||
2 | From: BALATON Zoltan <balaton@eik.bme.hu> | ||
3 | Date: Thu, 21 May 2020 21:39:44 +0200 | ||
4 | Subject: [PATCH 3/5] sm501: Use BIT(x) macro to shorten constant | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> | ||
10 | Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> | ||
11 | Message-id: 124bf5de8d7cf503b32b377d0445029a76bfbd49.1590089984.git.balaton@eik.bme.hu | ||
12 | Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> | ||
13 | |||
14 | Upstream-Status: Backport | ||
15 | CVE: CVE-2020-12829 dep#3 | ||
16 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
17 | |||
18 | --- | ||
19 | hw/display/sm501.c | 5 ++--- | ||
20 | 1 file changed, 2 insertions(+), 3 deletions(-) | ||
21 | |||
22 | diff --git a/hw/display/sm501.c b/hw/display/sm501.c | ||
23 | index f42d05e1e4..97660090bb 100644 | ||
24 | --- a/hw/display/sm501.c | ||
25 | +++ b/hw/display/sm501.c | ||
26 | @@ -701,7 +701,7 @@ static void sm501_2d_operation(SM501State *s) | ||
27 | { | ||
28 | /* obtain operation parameters */ | ||
29 | int cmd = (s->twoD_control >> 16) & 0x1F; | ||
30 | - int rtl = s->twoD_control & 0x8000000; | ||
31 | + int rtl = s->twoD_control & BIT(27); | ||
32 | int src_x = (s->twoD_source >> 16) & 0x01FFF; | ||
33 | int src_y = s->twoD_source & 0xFFFF; | ||
34 | int dst_x = (s->twoD_destination >> 16) & 0x01FFF; | ||
35 | @@ -751,8 +751,7 @@ static void sm501_2d_operation(SM501State *s) | ||
36 | } | ||
37 | } | ||
38 | |||
39 | - if ((s->twoD_source_base & 0x08000000) || | ||
40 | - (s->twoD_destination_base & 0x08000000)) { | ||
41 | + if (s->twoD_source_base & BIT(27) || s->twoD_destination_base & BIT(27)) { | ||
42 | qemu_log_mask(LOG_UNIMP, "sm501: only local memory is supported.\n"); | ||
43 | return; | ||
44 | } | ||
45 | -- | ||
46 | 2.25.1 | ||
47 | |||