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_p1.patch | 73 ---------------------- 1 file changed, 73 deletions(-) delete mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2016-3712_p1.patch (limited to 'meta/recipes-devtools/qemu/qemu/CVE-2016-3712_p1.patch') diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2016-3712_p1.patch b/meta/recipes-devtools/qemu/qemu/CVE-2016-3712_p1.patch deleted file mode 100644 index 07582ef929..0000000000 --- a/meta/recipes-devtools/qemu/qemu/CVE-2016-3712_p1.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 46aff2c7e91ef9f372ad38ba5e90c42b9b27ac75 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Tue, 26 Apr 2016 14:11:34 +0200 -Subject: [PATCH 1/4] vga: add vbe_enabled() helper - -Makes code a bit easier to read. - -Signed-off-by: Gerd Hoffmann -Signed-off-by: Michael Roth - -Upstream-Status: Backport -CVE: CVE-2016-3712 patch1 -Signed-off-by: Armin Kuster - ---- - hw/display/vga.c | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) - -diff --git a/hw/display/vga.c b/hw/display/vga.c -index 442fee9..cc1a682 100644 ---- a/hw/display/vga.c -+++ b/hw/display/vga.c -@@ -140,6 +140,11 @@ static uint32_t expand4[256]; - static uint16_t expand2[256]; - static uint8_t expand4to8[16]; - -+static inline bool vbe_enabled(VGACommonState *s) -+{ -+ return s->vbe_regs[VBE_DISPI_INDEX_ENABLE] & VBE_DISPI_ENABLED; -+} -+ - static void vga_update_memory_access(VGACommonState *s) - { - hwaddr base, offset, size; -@@ -562,7 +567,7 @@ static void vbe_fixup_regs(VGACommonState *s) - uint16_t *r = s->vbe_regs; - uint32_t bits, linelength, maxy, offset; - -- if (!(r[VBE_DISPI_INDEX_ENABLE] & VBE_DISPI_ENABLED)) { -+ if (!vbe_enabled(s)) { - /* vbe is turned off -- nothing to do */ - return; - } -@@ -1056,7 +1061,7 @@ static void vga_get_offsets(VGACommonState *s, - { - uint32_t start_addr, line_offset, line_compare; - -- if (s->vbe_regs[VBE_DISPI_INDEX_ENABLE] & VBE_DISPI_ENABLED) { -+ if (vbe_enabled(s)) { - line_offset = s->vbe_line_offset; - start_addr = s->vbe_start_addr; - line_compare = 65535; -@@ -1381,7 +1386,7 @@ static int vga_get_bpp(VGACommonState *s) - { - int ret; - -- if (s->vbe_regs[VBE_DISPI_INDEX_ENABLE] & VBE_DISPI_ENABLED) { -+ if (vbe_enabled(s)) { - ret = s->vbe_regs[VBE_DISPI_INDEX_BPP]; - } else { - ret = 0; -@@ -1393,7 +1398,7 @@ static void vga_get_resolution(VGACommonState *s, int *pwidth, int *pheight) - { - int width, height; - -- if (s->vbe_regs[VBE_DISPI_INDEX_ENABLE] & VBE_DISPI_ENABLED) { -+ if (vbe_enabled(s)) { - width = s->vbe_regs[VBE_DISPI_INDEX_XRES]; - height = s->vbe_regs[VBE_DISPI_INDEX_YRES]; - } else { --- -2.7.4 - -- cgit v1.2.3-54-g00ecf