dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0014-arm64-set-correct-length-of-device-path-end-entry.patch

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