433d851e9d
A tweak was needed to previous submit, and in the interim another security bug came in, so fix that as well. OBS-URL: https://build.opensuse.org/request/show/689150 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=461
35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
From: Peter Maydell <peter.maydell@linaro.org>
|
|
Date: Fri, 14 Dec 2018 13:30:52 +0000
|
|
Subject: 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 <peter.maydell@linaro.org>
|
|
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
|
|
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
Message-id: 20181130151712.2312-9-peter.maydell@linaro.org
|
|
(cherry picked from commit da885fe1ee8b4589047484bd7fa05a4905b52b17)
|
|
[BR: BSC#1130675 CVE-2018-20815]
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
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);
|