|
 |
3efed6 |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
3efed6 |
From: Leif Lindholm <leif.lindholm@linaro.org>
|
|
|
3efed6 |
Date: Wed, 14 Nov 2018 19:29:18 +0000
|
|
|
3efed6 |
Subject: [PATCH] arm64/efi: Fix breakage caused by verifiers
|
|
|
3efed6 |
|
|
|
3efed6 |
- add variable "err" (used but not defined),
|
|
|
3efed6 |
- add GRUB_FILE_TYPE_LINUX_KERNEL to grub_file_open() call.
|
|
|
3efed6 |
|
|
|
3efed6 |
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
|
|
|
3efed6 |
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
|
3efed6 |
|
|
|
3efed6 |
Conflicts:
|
|
|
3efed6 |
grub-core/loader/arm64/linux.c
|
|
|
3efed6 |
---
|
|
|
3efed6 |
grub-core/loader/arm64/linux.c | 3 ++-
|
|
|
3efed6 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
3efed6 |
|
|
|
3efed6 |
diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
|
|
|
b71686 |
index 48ea66596..864724dd4 100644
|
|
|
3efed6 |
--- a/grub-core/loader/arm64/linux.c
|
|
|
3efed6 |
+++ b/grub-core/loader/arm64/linux.c
|
|
|
3efed6 |
@@ -338,6 +338,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|
|
3efed6 |
struct linux_armxx_kernel_header lh;
|
|
|
3efed6 |
struct grub_armxx_linux_pe_header *pe;
|
|
|
3efed6 |
int rc;
|
|
|
3efed6 |
+ grub_err_t err;
|
|
|
3efed6 |
|
|
|
3efed6 |
grub_dl_ref (my_mod);
|
|
|
3efed6 |
|
|
|
3efed6 |
@@ -347,7 +348,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|
|
3efed6 |
goto fail;
|
|
|
3efed6 |
}
|
|
|
3efed6 |
|
|
|
3efed6 |
- file = grub_file_open (argv[0]);
|
|
|
3efed6 |
+ file = grub_file_open (argv[0], GRUB_FILE_TYPE_LINUX_KERNEL);
|
|
|
3efed6 |
if (!file)
|
|
|
3efed6 |
goto fail;
|
|
|
3efed6 |
|