summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/qemu/qemu/CVE-2016-3712_p3.patch
diff options
context:
space:
mode:
authorSona Sarmadi <sona.sarmadi@enea.com>2017-05-10 14:17:32 +0200
committerAdrian Dudau <adrian.dudau@enea.com>2017-05-11 15:28:43 +0200
commit71d585a8deafbeea66a517313d9ae10862484d22 (patch)
tree62f5374c4202f9885e855ef824ffe9e1231c1801 /meta/recipes-devtools/qemu/qemu/CVE-2016-3712_p3.patch
parent07c94f74cda62c672e7e80292f917a76e1214be0 (diff)
downloadpoky-71d585a8deafbeea66a517313d9ae10862484d22.tar.gz
qemu: Upgrade 2.5.1 -> 2.5.1.1
This is a minor upgrade only comes with security fixes in qemu VGA and UART code to avoid corruptions (CVE-2016-3710 and CVE-2016-3712). For review details, http://git.qemu.org/?p=qemu.git;a=log;h=v2.5.1.1 (From OE-Core rev: da522c0c248c9a8b10a90de4cd6e7e05367e637d) This patch is backported from upstream morty branch: http://git.yoctoproject.org/cgit/cgit.cgi/poky/patch/?id=b0207e742542cc44086d612df0a216cc45875538 Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com> Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
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.patch34
1 files changed, 0 insertions, 34 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
deleted file mode 100644
index 3e6644d942..0000000000
--- a/meta/recipes-devtools/qemu/qemu/CVE-2016-3712_p3.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From a6e5e5dd4bbc022acbd10ebcf415a6a57418d09e Mon Sep 17 00:00:00 2001
2From: Gerd Hoffmann <kraxel@redhat.com>
3Date: Tue, 26 Apr 2016 15:39:22 +0200
4Subject: [PATCH 3/4] vga: update vga register setup on vbe changes
5
6Call the new vbe_update_vgaregs() function on vbe configuration
7changes, to make sure vga registers are up-to-date.
8
9Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
10Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
11
12Upstream-Status: Backport
13CVE: CVE-2016-3712 patch3
14Signed-off-by: Armin Kuster <akuster@mvista.com>
15
16---
17 hw/display/vga.c | 1 +
18 1 file changed, 1 insertion(+)
19
20diff --git a/hw/display/vga.c b/hw/display/vga.c
21index 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--
332.7.4
34