qemu: update to 3.1.1.1
PATCH 1/1 qemu: update to 3.1.1.1
bug fix only update.
Drop patches included in update.
For full set of changes, see: https://git.qemu.org/?p=qemu.git;a=shortlog;h=refs/tags/v3.1.1.1
Signed-off-by Armin Kuster <[email protected]>
---
...qemu-native_3.1.0.bb => qemu-native_3.1.1.1.bb} | 0
...tive_3.1.0.bb => qemu-system-native_3.1.1.1.bb} | 0
meta/recipes-devtools/qemu/qemu.inc | 14 +-
.../0001-egl-headless-add-egl_create_context.patch | 50 -----
.../qemu/qemu/0014-fix-CVE-2018-16872.patch | 85 --------
.../qemu/qemu/0015-fix-CVE-2018-20124.patch | 60 ------
.../qemu/qemu/0016-fix-CVE-2018-20125.patch | 54 ------
.../qemu/qemu/0017-fix-CVE-2018-20126.patch | 113 -----------
.../qemu/qemu/0018-fix-CVE-2018-20191.patch | 47 -----
.../qemu/qemu/0019-fix-CVE-2018-20216.patch | 85 --------
.../qemu/qemu/CVE-2018-20815.patch | 38 ----
.../recipes-devtools/qemu/qemu/CVE-2019-3812.patch | 39 ----
.../recipes-devtools/qemu/qemu/CVE-2019-8934.patch | 215 ---------------------
.../qemu/{qemu_3.1.0.bb => qemu_3.1.1.1.bb} | 0
14 files changed, 2 insertions(+), 798 deletions(-)
rename meta/recipes-devtools/qemu/{qemu-native_3.1.0.bb => qemu-native_3.1.1.1.bb} (100%)
rename meta/recipes-devtools/qemu/{qemu-system-native_3.1.0.bb => qemu-system-native_3.1.1.1.bb} (100%)
delete mode 100644 meta/recipes-devtools/qemu/qemu/0001-egl-headless-add-egl_create_context.patch
delete mode 100644 meta/recipes-devtools/qemu/qemu/0014-fix-CVE-2018-16872.patch
delete mode 100644 meta/recipes-devtools/qemu/qemu/0015-fix-CVE-2018-20124.patch
delete mode 100644 meta/recipes-devtools/qemu/qemu/0016-fix-CVE-2018-20125.patch
delete mode 100644 meta/recipes-devtools/qemu/qemu/0017-fix-CVE-2018-20126.patch
delete mode 100644 meta/recipes-devtools/qemu/qemu/0018-fix-CVE-2018-20191.patch
delete mode 100644 meta/recipes-devtools/qemu/qemu/0019-fix-CVE-2018-20216.patch
delete mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2018-20815.patch
delete mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2019-3812.patch
delete mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2019-8934.patch
rename meta/recipes-devtools/qemu/{qemu_3.1.0.bb => qemu_3.1.1.1.bb} (100%)meta/recipes-devtools/qemu/qemu-native_3.1.1.1.bb renamed from meta/recipes-devtools/qemu/qemu-native_3.1.0.bb +0 -0
meta/recipes-devtools/qemu/qemu-system-native_3.1.1.1.bb renamed from meta/recipes-devtools/qemu/qemu-system-native_3.1.0.bb +0 -0
meta/recipes-devtools/qemu/qemu.inc +2 -12
@@ -22,24 +22,14 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0010-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \ file://0011-Revert-linux-user-fix-mmap-munmap-mprotect-mremap-sh.patch \ file://0001-Add-a-missing-X11-include.patch \ - file://0001-egl-headless-add-egl_create_context.patch \ - file://0014-fix-CVE-2018-16872.patch \ - file://0015-fix-CVE-2018-20124.patch \ - file://0016-fix-CVE-2018-20125.patch \ - file://0017-fix-CVE-2018-20126.patch \ - file://0018-fix-CVE-2018-20191.patch \ - file://0019-fix-CVE-2018-20216.patch \ - file://CVE-2019-3812.patch \ file://0014-linux-user-fix-to-handle-variably-sized-SIOCGSTAMP-w.patch \ - file://CVE-2018-20815.patch \ - file://CVE-2019-8934.patch \ file://0001-linux-user-assume-__NR_gettid-always-exists.patch \ file://0001-linux-user-rename-gettid-to-sys_gettid-to-avoid-clas.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" -SRC_URI[md5sum] = "fb687ce0b02d3bf4327e36d3b99427a8" -SRC_URI[sha256sum] = "6a0508df079a0a33c2487ca936a56c12122f105b8a96a44374704bef6c69abfc" +SRC_URI[md5sum] = "aafb005c252eb3a667c2468868348c0a" +SRC_URI[sha256sum] = "b148fc3c7382c5addd915db433383160ca7b840bc6ea90bb0d35c6b253526d56" COMPATIBLE_HOST_mipsarchn32 = "null" COMPATIBLE_HOST_mipsarchn64 = "null"
meta/recipes-devtools/qemu/qemu/0001-egl-headless-add-egl_create_context.patch deleted +0 -50
50 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/0014-fix-CVE-2018-16872.patch deleted +0 -85
85 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/0015-fix-CVE-2018-20124.patch deleted +0 -60
60 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/0016-fix-CVE-2018-20125.patch deleted +0 -54
54 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/0017-fix-CVE-2018-20126.patch deleted +0 -113
113 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/0018-fix-CVE-2018-20191.patch deleted +0 -47
47 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/0019-fix-CVE-2018-20216.patch deleted +0 -85
85 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/CVE-2018-20815.patch deleted +0 -38
@@ -1,38 +0,0 @@ -From 8bb018af1a7f2b9965f872a4b1121864e73e1b61 Mon Sep 17 00:00:00 2001 -From: Peter Maydell <[email protected]> -Date: Fri, 14 Dec 2018 13:30:52 +0000 -Subject: [PATCH] device_tree.c: Don't use load_image() - -The load_image() function is deprecated, as it does not let the -caller specify how large the buffer to read the file into is. -Instead use load_image_size(). - -Signed-off-by: Peter Maydell <[email protected]> -Reviewed-by: Richard Henderson <[email protected]> -Reviewed-by: Stefan Hajnoczi <[email protected]> -Reviewed-by: Michael S. Tsirkin <[email protected]> -Reviewed-by: Eric Blake <[email protected]> -Message-id: [email protected] - -Upstream-Status: Backport [https://github.com/qemu/qemu/commit/da885fe1ee8b4589047484bd7fa05a4905b52b17] -CVE: CVE-2018-20815 -Signed-off-by: Naveen Saini <[email protected]> ---- - device_tree.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/device_tree.c b/device_tree.c -index 6d9c9726f6..296278e12a 100644 ---- a/device_tree.c -+++ b/device_tree.c -@@ -91,7 +91,7 @@ void *load_device_tree(const char *filename_path, int *sizep) - /* First allocate space in qemu for device tree */ - fdt = g_malloc0(dt_size); - -- dt_file_load_size = load_image(filename_path, fdt); -+ dt_file_load_size = load_image_size(filename_path, fdt, dt_size); - if (dt_file_load_size < 0) { - error_report("Unable to open device tree file '%s'", - filename_path); --- -2.17.1
meta/recipes-devtools/qemu/qemu/CVE-2019-3812.patch deleted +0 -39
@@ -1,39 +0,0 @@ -QEMU, through version 2.10 and through version 3.1.0, is vulnerable to an -out-of-bounds read of up to 128 bytes in the hw/i2c/i2c-ddc.c:i2c_ddc() -function. A local attacker with permission to execute i2c commands could exploit -this to read stack memory of the qemu process on the host. - -CVE: CVE-2019-3812 -Upstream-Status: Backport -Signed-off-by: Ross Burton <[email protected]> - -From b05b267840515730dbf6753495d5b7bd8b04ad1c Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann <[email protected]> -Date: Tue, 8 Jan 2019 11:23:01 +0100 -Subject: [PATCH] i2c-ddc: fix oob read -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Suggested-by: Michael Hanselmann <[email protected]> -Signed-off-by: Gerd Hoffmann <[email protected]> -Reviewed-by: Michael Hanselmann <[email protected]> -Reviewed-by: Philippe Mathieu-Daudé <[email protected]> -Message-id: [email protected] ---- - hw/i2c/i2c-ddc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/hw/i2c/i2c-ddc.c b/hw/i2c/i2c-ddc.c -index be34fe072cf..0a0367ff38f 100644 ---- a/hw/i2c/i2c-ddc.c -+++ b/hw/i2c/i2c-ddc.c -@@ -56,7 +56,7 @@ static int i2c_ddc_rx(I2CSlave *i2c) - I2CDDCState *s = I2CDDC(i2c); - - int value; -- value = s->edid_blob[s->reg]; -+ value = s->edid_blob[s->reg % sizeof(s->edid_blob)]; - s->reg++; - return value; - }
meta/recipes-devtools/qemu/qemu/CVE-2019-8934.patch deleted +0 -215
215 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu_3.1.1.1.bb renamed from meta/recipes-devtools/qemu/qemu_3.1.0.bb +0 -0
Signature · 1 line
2.7.4