summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/qemu/qemu/CVE-2018-20815.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/CVE-2018-20815.patch')
-rw-r--r--meta/recipes-devtools/qemu/qemu/CVE-2018-20815.patch38
1 files changed, 0 insertions, 38 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2018-20815.patch b/meta/recipes-devtools/qemu/qemu/CVE-2018-20815.patch
deleted file mode 100644
index c9508d9ba8..0000000000
--- a/meta/recipes-devtools/qemu/qemu/CVE-2018-20815.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From 8bb018af1a7f2b9965f872a4b1121864e73e1b61 Mon Sep 17 00:00:00 2001
2From: Peter Maydell <peter.maydell@linaro.org>
3Date: Fri, 14 Dec 2018 13:30:52 +0000
4Subject: [PATCH] device_tree.c: Don't use load_image()
5
6The load_image() function is deprecated, as it does not let the
7caller specify how large the buffer to read the file into is.
8Instead use load_image_size().
9
10Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
11Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
12Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
13Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
14Reviewed-by: Eric Blake <eblake@redhat.com>
15Message-id: 20181130151712.2312-9-peter.maydell@linaro.org
16
17Upstream-Status: Backport [https://github.com/qemu/qemu/commit/da885fe1ee8b4589047484bd7fa05a4905b52b17]
18CVE: CVE-2018-20815
19Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
20---
21 device_tree.c | 2 +-
22 1 file changed, 1 insertion(+), 1 deletion(-)
23
24diff --git a/device_tree.c b/device_tree.c
25index 6d9c9726f6..296278e12a 100644
26--- a/device_tree.c
27+++ b/device_tree.c
28@@ -91,7 +91,7 @@ void *load_device_tree(const char *filename_path, int *sizep)
29 /* First allocate space in qemu for device tree */
30 fdt = g_malloc0(dt_size);
31
32- dt_file_load_size = load_image(filename_path, fdt);
33+ dt_file_load_size = load_image_size(filename_path, fdt, dt_size);
34 if (dt_file_load_size < 0) {
35 error_report("Unable to open device tree file '%s'",
36 filename_path);
37--
382.17.1