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