77 lines
3.1 KiB
Diff
77 lines
3.1 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Daniel Kiper <daniel.kiper@oracle.com>
|
||
|
|
Date: Thu, 3 Dec 2020 16:01:47 +0100
|
||
|
|
Subject: [PATCH] efi: Add a function to read EFI variables with attributes
|
||
|
|
|
||
|
|
It will be used to properly detect and report UEFI Secure Boot status to
|
||
|
|
the x86 Linux kernel. The functionality will be added by subsequent patches.
|
||
|
|
|
||
|
|
Signed-off-by: Ignat Korchagin <ignat@cloudflare.com>
|
||
|
|
Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
|
||
|
|
Signed-off-by: Marco A Benatto <mbenatto@redhat.com>
|
||
|
|
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
|
||
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
||
|
|
(cherry picked from commit ac5c9367548750e75ed1e7fc4354a3d20186d733)
|
||
|
|
---
|
||
|
|
grub-core/kern/efi/efi.c | 16 +++++++++++++---
|
||
|
|
include/grub/efi/efi.h | 5 +++++
|
||
|
|
2 files changed, 18 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
|
||
|
|
index 335033975d..fccea20a01 100644
|
||
|
|
--- a/grub-core/kern/efi/efi.c
|
||
|
|
+++ b/grub-core/kern/efi/efi.c
|
||
|
|
@@ -242,8 +242,11 @@ grub_efi_set_variable(const char *var, const grub_efi_guid_t *guid,
|
||
|
|
}
|
||
|
|
|
||
|
|
grub_efi_status_t
|
||
|
|
-grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
|
||
|
|
- grub_size_t *datasize_out, void **data_out)
|
||
|
|
+grub_efi_get_variable_with_attributes (const char *var,
|
||
|
|
+ const grub_efi_guid_t *guid,
|
||
|
|
+ grub_size_t *datasize_out,
|
||
|
|
+ void **data_out,
|
||
|
|
+ grub_efi_uint32_t *attributes)
|
||
|
|
{
|
||
|
|
grub_efi_status_t status;
|
||
|
|
grub_efi_uintn_t datasize = 0;
|
||
|
|
@@ -280,7 +283,7 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
|
||
|
|
return GRUB_EFI_OUT_OF_RESOURCES;
|
||
|
|
}
|
||
|
|
|
||
|
|
- status = efi_call_5 (r->get_variable, var16, guid, NULL, &datasize, data);
|
||
|
|
+ status = efi_call_5 (r->get_variable, var16, guid, attributes, &datasize, data);
|
||
|
|
grub_free (var16);
|
||
|
|
|
||
|
|
if (status == GRUB_EFI_SUCCESS)
|
||
|
|
@@ -294,6 +297,13 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
|
||
|
|
return status;
|
||
|
|
}
|
||
|
|
|
||
|
|
+grub_efi_status_t
|
||
|
|
+grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
|
||
|
|
+ grub_size_t *datasize_out, void **data_out)
|
||
|
|
+{
|
||
|
|
+ return grub_efi_get_variable_with_attributes (var, guid, datasize_out, data_out, NULL);
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
#pragma GCC diagnostic ignored "-Wcast-align"
|
||
|
|
|
||
|
|
/* Search the mods section from the PE32/PE32+ image. This code uses
|
||
|
|
diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
|
||
|
|
index 90a85d7d9a..7af979b184 100644
|
||
|
|
--- a/include/grub/efi/efi.h
|
||
|
|
+++ b/include/grub/efi/efi.h
|
||
|
|
@@ -113,6 +113,11 @@ grub_err_t EXPORT_FUNC (grub_efi_set_virtual_address_map) (grub_efi_uintn_t memo
|
||
|
|
grub_efi_uintn_t descriptor_size,
|
||
|
|
grub_efi_uint32_t descriptor_version,
|
||
|
|
grub_efi_memory_descriptor_t *virtual_map);
|
||
|
|
+grub_efi_status_t EXPORT_FUNC (grub_efi_get_variable_with_attributes) (const char *variable,
|
||
|
|
+ const grub_efi_guid_t *guid,
|
||
|
|
+ grub_size_t *datasize_out,
|
||
|
|
+ void **data_out,
|
||
|
|
+ grub_efi_uint32_t *attributes);
|
||
|
|
grub_efi_status_t EXPORT_FUNC (grub_efi_get_variable) (const char *variable,
|
||
|
|
const grub_efi_guid_t *guid,
|
||
|
|
grub_size_t *datasize_out,
|