diff options
author | Armin Kuster <akuster@mvista.com> | 2016-09-19 18:12:42 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-23 23:22:04 +0100 |
commit | 98e7d8a9a0da4e63fa4754838ab7e4ff3c119da4 (patch) | |
tree | 0696bef640641d37d72197ddcb54ce4b9d32bc2b /meta/recipes-devtools/qemu/qemu/CVE-2016-3712_p3.patch | |
parent | ffa3a07ac11f7affc63c00da965523c717389877 (diff) | |
download | poky-98e7d8a9a0da4e63fa4754838ab7e4ff3c119da4.tar.gz |
qemu: Security Fix CVE-2016-3712
affects qemu < 2.6.0
(From OE-Core rev: 6f25d966c41df5315d253859d9ebf231963bf671)
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/CVE-2016-3712_p3.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/CVE-2016-3712_p3.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2016-3712_p3.patch b/meta/recipes-devtools/qemu/qemu/CVE-2016-3712_p3.patch new file mode 100644 index 0000000000..3e6644d942 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2016-3712_p3.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From a6e5e5dd4bbc022acbd10ebcf415a6a57418d09e Mon Sep 17 00:00:00 2001 | ||
2 | From: Gerd Hoffmann <kraxel@redhat.com> | ||
3 | Date: Tue, 26 Apr 2016 15:39:22 +0200 | ||
4 | Subject: [PATCH 3/4] vga: update vga register setup on vbe changes | ||
5 | |||
6 | Call the new vbe_update_vgaregs() function on vbe configuration | ||
7 | changes, to make sure vga registers are up-to-date. | ||
8 | |||
9 | Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> | ||
10 | Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> | ||
11 | |||
12 | Upstream-Status: Backport | ||
13 | CVE: CVE-2016-3712 patch3 | ||
14 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
15 | |||
16 | --- | ||
17 | hw/display/vga.c | 1 + | ||
18 | 1 file changed, 1 insertion(+) | ||
19 | |||
20 | diff --git a/hw/display/vga.c b/hw/display/vga.c | ||
21 | index f1987e3..10ac7df 100644 | ||
22 | --- a/hw/display/vga.c | ||
23 | +++ b/hw/display/vga.c | ||
24 | @@ -761,6 +761,7 @@ void vbe_ioport_write_data(void *opaque, uint32_t addr, uint32_t val) | ||
25 | case VBE_DISPI_INDEX_Y_OFFSET: | ||
26 | s->vbe_regs[s->vbe_index] = val; | ||
27 | vbe_fixup_regs(s); | ||
28 | + vbe_update_vgaregs(s); | ||
29 | break; | ||
30 | case VBE_DISPI_INDEX_BANK: | ||
31 | val &= s->vbe_bank_mask; | ||
32 | -- | ||
33 | 2.7.4 | ||
34 | |||