From 71d585a8deafbeea66a517313d9ae10862484d22 Mon Sep 17 00:00:00 2001 From: Sona Sarmadi Date: Wed, 10 May 2017 14:17:32 +0200 Subject: qemu: Upgrade 2.5.1 -> 2.5.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Sona Sarmadi Signed-off-by: Adrian Dudau --- .../qemu/qemu/CVE-2016-3712_p3.patch | 34 ---------------------- 1 file changed, 34 deletions(-) delete mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2016-3712_p3.patch (limited to 'meta/recipes-devtools/qemu/qemu/CVE-2016-3712_p3.patch') 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 @@ -From a6e5e5dd4bbc022acbd10ebcf415a6a57418d09e Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Tue, 26 Apr 2016 15:39:22 +0200 -Subject: [PATCH 3/4] vga: update vga register setup on vbe changes - -Call the new vbe_update_vgaregs() function on vbe configuration -changes, to make sure vga registers are up-to-date. - -Signed-off-by: Gerd Hoffmann -Signed-off-by: Michael Roth - -Upstream-Status: Backport -CVE: CVE-2016-3712 patch3 -Signed-off-by: Armin Kuster - ---- - hw/display/vga.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/hw/display/vga.c b/hw/display/vga.c -index f1987e3..10ac7df 100644 ---- a/hw/display/vga.c -+++ b/hw/display/vga.c -@@ -761,6 +761,7 @@ void vbe_ioport_write_data(void *opaque, uint32_t addr, uint32_t val) - case VBE_DISPI_INDEX_Y_OFFSET: - s->vbe_regs[s->vbe_index] = val; - vbe_fixup_regs(s); -+ vbe_update_vgaregs(s); - break; - case VBE_DISPI_INDEX_BANK: - val &= s->vbe_bank_mask; --- -2.7.4 - -- cgit v1.2.3-54-g00ecf