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