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