|
 |
b9d01e |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
b9d01e |
From: Robbie Harwood <rharwood@redhat.com>
|
|
|
b9d01e |
Date: Wed, 11 May 2022 16:37:14 -0400
|
|
|
b9d01e |
Subject: [PATCH] Fixup grub_efi_get_variable() type in our loaders
|
|
|
b9d01e |
|
|
|
b9d01e |
Has a new type now that we have 04ae030d0eea8668d4417702d88bf2cf04713d80
|
|
|
b9d01e |
("efi: Return grub_efi_status_t from grub_efi_get_variable()").
|
|
|
b9d01e |
|
|
|
b9d01e |
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
|
|
|
b9d01e |
---
|
|
|
b9d01e |
grub-core/kern/efi/init.c | 4 ++--
|
|
|
b9d01e |
grub-core/kern/efi/sb.c | 4 ++--
|
|
|
b9d01e |
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
b9d01e |
|
|
|
b9d01e |
diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c
|
|
|
b9d01e |
index 501608f743..565ce541f5 100644
|
|
|
b9d01e |
--- a/grub-core/kern/efi/init.c
|
|
|
b9d01e |
+++ b/grub-core/kern/efi/init.c
|
|
|
b9d01e |
@@ -104,8 +104,8 @@ grub_efi_env_init (void)
|
|
|
b9d01e |
struct grub_envblk envblk_s = { NULL, 0 };
|
|
|
b9d01e |
grub_envblk_t envblk = &envblk_s;
|
|
|
b9d01e |
|
|
|
b9d01e |
- envblk_s.buf = grub_efi_get_variable ("GRUB_ENV", &efi_grub_guid,
|
|
|
b9d01e |
- &envblk_s.size);
|
|
|
b9d01e |
+ grub_efi_get_variable ("GRUB_ENV", &efi_grub_guid, &envblk_s.size,
|
|
|
b9d01e |
+ &envblk_s.buf);
|
|
|
b9d01e |
if (!envblk_s.buf || envblk_s.size < 1)
|
|
|
b9d01e |
return;
|
|
|
b9d01e |
|
|
|
b9d01e |
diff --git a/grub-core/kern/efi/sb.c b/grub-core/kern/efi/sb.c
|
|
|
b9d01e |
index d74778b0ca..f84d7d3080 100644
|
|
|
b9d01e |
--- a/grub-core/kern/efi/sb.c
|
|
|
b9d01e |
+++ b/grub-core/kern/efi/sb.c
|
|
|
b9d01e |
@@ -35,7 +35,7 @@ grub_efi_secure_boot (void)
|
|
|
b9d01e |
char *setup_mode = NULL;
|
|
|
b9d01e |
grub_efi_boolean_t ret = 0;
|
|
|
b9d01e |
|
|
|
b9d01e |
- secure_boot = grub_efi_get_variable("SecureBoot", &efi_var_guid, &datasize);
|
|
|
b9d01e |
+ grub_efi_get_variable("SecureBoot", &efi_var_guid, &datasize, &secure_boot);
|
|
|
b9d01e |
if (datasize != 1 || !secure_boot)
|
|
|
b9d01e |
{
|
|
|
b9d01e |
grub_dprintf ("secureboot", "No SecureBoot variable\n");
|
|
|
b9d01e |
@@ -43,7 +43,7 @@ grub_efi_secure_boot (void)
|
|
|
b9d01e |
}
|
|
|
b9d01e |
grub_dprintf ("secureboot", "SecureBoot: %d\n", *secure_boot);
|
|
|
b9d01e |
|
|
|
b9d01e |
- setup_mode = grub_efi_get_variable("SetupMode", &efi_var_guid, &datasize);
|
|
|
b9d01e |
+ grub_efi_get_variable("SetupMode", &efi_var_guid, &datasize, &setup_mode);
|
|
|
b9d01e |
if (datasize != 1 || !setup_mode)
|
|
|
b9d01e |
{
|
|
|
b9d01e |
grub_dprintf ("secureboot", "No SetupMode variable\n");
|