You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
40 lines
1.5 KiB
40 lines
1.5 KiB
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
|
From: Leif Lindholm <leif.lindholm@linaro.org> |
|
Date: Tue, 7 Jan 2014 17:52:50 +0000 |
|
Subject: [PATCH] arm64: set correct length of device path end entry |
|
|
|
The length of the Device Path End entry in the grub_linux_boot() |
|
function was incorrectly set to 0. This triggers an assert failure |
|
in debug builds of Tianocore. |
|
|
|
Set it to sizeof (grub_efi_device_path_t). |
|
--- |
|
grub-core/loader/arm64/linux.c | 2 +- |
|
ChangeLog | 4 ++++ |
|
2 files changed, 5 insertions(+), 1 deletion(-) |
|
|
|
diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c |
|
index 9d15aad625e..75ad871a81c 100644 |
|
--- a/grub-core/loader/arm64/linux.c |
|
+++ b/grub-core/loader/arm64/linux.c |
|
@@ -268,7 +268,7 @@ grub_linux_boot (void) |
|
|
|
mempath[1].header.type = GRUB_EFI_END_DEVICE_PATH_TYPE; |
|
mempath[1].header.subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE; |
|
- mempath[1].header.length = 0; |
|
+ mempath[1].header.length = sizeof (grub_efi_device_path_t); |
|
|
|
b = grub_efi_system_table->boot_services; |
|
status = b->load_image (0, grub_efi_image_handle, |
|
diff --git a/ChangeLog b/ChangeLog |
|
index 0b9fa05b2a0..4ec5517bded 100644 |
|
--- a/ChangeLog |
|
+++ b/ChangeLog |
|
@@ -1,3 +1,7 @@ |
|
+2014-01-07 Leif Lindholm <leif.lindholm@linaro.org> |
|
+ |
|
+ * grub-core/loader/arm64/linux.c: correctly set device path end length. |
|
+ |
|
2014-01-07 Andrey Borzenkov <arvidjaar@gmail.com> |
|
|
|
* util/grub-install.c: Use bootaa64.efi instead of bootaarch64.efi on
|
|
|