2018-07-12 14:56:34 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2017-06-16 19:31:32 +00:00
|
|
|
From: Julien Grall <julien.grall@linaro.org>
|
|
|
|
|
Date: Fri, 19 Feb 2016 16:28:52 +0000
|
2018-07-10 18:39:10 +00:00
|
|
|
Subject: [PATCH] arm64/xen_boot: Fix Xen boot using GRUB2 on AARCH64
|
2017-06-16 19:31:32 +00:00
|
|
|
|
|
|
|
|
Xen is currently crashing because of malformed compatible property for
|
|
|
|
|
the boot module. This is because the property string is not
|
|
|
|
|
null-terminated as requested by the ePAR spec.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Julien Grall <julien.grall@linaro.org>
|
|
|
|
|
Tested-by: Fu Wei <fu.wei@linaro.org>
|
|
|
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
|
|
|
---
|
|
|
|
|
grub-core/loader/arm64/xen_boot.c | 2 +-
|
|
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c
|
2018-02-27 18:56:41 +00:00
|
|
|
index a914eb8e2df..8ae43d7e894 100644
|
2017-06-16 19:31:32 +00:00
|
|
|
--- a/grub-core/loader/arm64/xen_boot.c
|
|
|
|
|
+++ b/grub-core/loader/arm64/xen_boot.c
|
|
|
|
|
@@ -156,7 +156,7 @@ prepare_xen_module_params (struct xen_boot_binary *module, void *xen_boot_fdt)
|
|
|
|
|
grub_fdt_add_subnode (xen_boot_fdt, chosen_node, module_name);
|
|
|
|
|
|
|
|
|
|
retval = grub_fdt_set_prop (xen_boot_fdt, module_node, "compatible",
|
|
|
|
|
- MODULE_CUSTOM_COMPATIBLE, sizeof(MODULE_CUSTOM_COMPATIBLE) - 1);
|
|
|
|
|
+ MODULE_CUSTOM_COMPATIBLE, sizeof(MODULE_CUSTOM_COMPATIBLE));
|
|
|
|
|
if (retval)
|
|
|
|
|
return grub_error (GRUB_ERR_IO, "failed to update FDT");
|
|
|
|
|
|
