7e98da058f
This change reorganizes and cleanups our patches to reduce the patch number from 314 patches to 187. That's achieved by dropping patches that are later reverted and squashing fixes for earlier patches that introduced features. There are no code changes and the diff with upstream is the same before and after the cleanup. Having fewer patches makes easier to manage the patchset and also will ease to rebase them on top of the latest grub-2.04 release. Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
30 lines
1.0 KiB
Diff
30 lines
1.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Heinrich Schuchardt <xypron.glpk@gmx.de>
|
|
Date: Mon, 17 Dec 2018 22:00:24 +0100
|
|
Subject: [PATCH] grub-core/loader/efi/fdt.c: Do not copy random memory
|
|
|
|
We should not try to copy any memory area which is outside of the original
|
|
fdt. If this extra memory is controlled by a hypervisor this might end
|
|
with a crash.
|
|
|
|
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
|
|
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
---
|
|
grub-core/loader/efi/fdt.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/grub-core/loader/efi/fdt.c b/grub-core/loader/efi/fdt.c
|
|
index a9dbcfdfeaf..cecd617dccc 100644
|
|
--- a/grub-core/loader/efi/fdt.c
|
|
+++ b/grub-core/loader/efi/fdt.c
|
|
@@ -68,7 +68,7 @@ grub_fdt_load (grub_size_t additional_size)
|
|
|
|
if (raw_fdt)
|
|
{
|
|
- grub_memmove (fdt, raw_fdt, size);
|
|
+ grub_memmove (fdt, raw_fdt, size - additional_size);
|
|
grub_fdt_set_totalsize (fdt, size);
|
|
}
|
|
else
|