qemu: Security fixes CVE-2018-20815 CVE-2019-9824
PATCH 1/1 qemu: Security fixes CVE-2018-20815 CVE-2019-9824
From: Armin Kuster <[email protected]>
Source: qemu.org
MR: 98623
Type: Security Fix
Disposition: Backport from qemu.org
ChangeID: 03b3f28e5860ef1cb9f58dce89f252bd7ed59f37 Description:
Fixes both CVE-2018-20815 and CVE-2019-9824
--- .../qemu/qemu/CVE-2018-20815_p1.patch | 42 +++++++++++++++++ .../qemu/qemu/CVE-2018-20815_p2.patch | 52 ++++++++++++++++++++++ .../recipes-devtools/qemu/qemu/CVE-2019-9824.patch | 47 +++++++++++++++++++ meta/recipes-devtools/qemu/qemu_3.0.0.bb | 3 ++ 4 files changed, 144 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2018-20815_p1.patch create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2018-20815_p2.patch create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2019-9824.patch
meta/recipes-devtools/qemu/qemu/CVE-2018-20815_p1.patch new file +42 -0
@@ -0,0 +1,42 @@ +From da885fe1ee8b4589047484bd7fa05a4905b52b17 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 +CVE: CVE-2018-20815 +affects <= 3.0.1 + +Signed-off-by: Armin Kuster <[email protected]> + +--- + device_tree.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/device_tree.c b/device_tree.c +index 6d9c972..296278e 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.7.4 +
meta/recipes-devtools/qemu/qemu/CVE-2018-20815_p2.patch new file +52 -0
52 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/CVE-2019-9824.patch new file +47 -0
47 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu_3.0.0.bb +3 -0
@@ -32,6 +32,9 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://CVE-2018-19364_p2.patch \ file://CVE-2018-19489.patch \ file://CVE-2019-12155.patch \ + file://CVE-2018-20815_p1.patch \ + file://CVE-2018-20815_p2.patch \ + file://CVE-2019-9824.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
Signature · 1 line
2.7.4
✗ patchtest: failure for qemu: Security fixes CVE-2018-20815 CVE-2019-9824
== Series Details ==
Series: qemu: Security fixes CVE-2018-20815 CVE-2019-9824
Revision: 1
URL : https://patchwork.openembedded.org/series/18484/
State : failure
== Summary ==
Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:
* Issue Series does not apply on top of target branch [test_series_merge_on_head]
Suggested fix Rebase your series on top of targeted branch
Targeted branch thud (currently at f162d5bfe6)
If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).
---
Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe