proxmox-mirrors/grub2
1
0
Fork 0
mirror of https://git.proxmox.com/git/grub2 synced 2025-07-27 10:08:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

efi: Return grub_efi_status_t from grub_efi_get_variable()

Browse Source 
This is needed 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: 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>
This commit is contained in:
Daniel Kiper 2020-12-03 16:01:46 +01:00
parent f76a27996c
commit 04ae030d0e
4 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
grub-core/commands/efi/efifwsetup.c
View File

@ -38,8 +38,8 @@ grub_cmd_fwsetup (grub_command_t cmd __attribute__ ((unused)),
grub_size_t oi_size; grub_size_t oi_size;
grub_efi_guid_t global = GRUB_EFI_GLOBAL_VARIABLE_GUID; grub_efi_guid_t global = GRUB_EFI_GLOBAL_VARIABLE_GUID;
old_os_indications = grub_efi_get_variable ("OsIndications", &global, grub_efi_get_variable ("OsIndications", &global, &oi_size,
&oi_size); (void **) &old_os_indications);
if (old_os_indications != NULL && oi_size == sizeof (os_indications)) if (old_os_indications != NULL && oi_size == sizeof (os_indications))
os_indications |= *old_os_indications; os_indications |= *old_os_indications;
@ -63,8 +63,8 @@ efifwsetup_is_supported (void)
grub_size_t oi_size = 0; grub_size_t oi_size = 0;
grub_efi_guid_t global = GRUB_EFI_GLOBAL_VARIABLE_GUID; grub_efi_guid_t global = GRUB_EFI_GLOBAL_VARIABLE_GUID;
os_indications_supported = grub_efi_get_variable ("OsIndicationsSupported", grub_efi_get_variable ("OsIndicationsSupported", &global, &oi_size,
&global, &oi_size); (void **) &os_indications_supported);
if (!os_indications_supported) if (!os_indications_supported)
return 0; return 0;

16
grub-core/kern/efi/efi.c
View File

@ -223,9 +223,9 @@ grub_efi_set_variable(const char *var, const grub_efi_guid_t *guid,
return grub_error (GRUB_ERR_IO, "could not set EFI variable `%s'", var); return grub_error (GRUB_ERR_IO, "could not set EFI variable `%s'", var);
} }
void * grub_efi_status_t
grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid, grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
grub_size_t *datasize_out) grub_size_t *datasize_out, void **data_out)
{ {
grub_efi_status_t status; grub_efi_status_t status;
grub_efi_uintn_t datasize = 0; grub_efi_uintn_t datasize = 0;
@ -234,13 +234,14 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
void *data; void *data;
grub_size_t len, len16; grub_size_t len, len16;
*data_out = NULL;
*datasize_out = 0; *datasize_out = 0;
len = grub_strlen (var); len = grub_strlen (var);
len16 = len * GRUB_MAX_UTF16_PER_UTF8; len16 = len * GRUB_MAX_UTF16_PER_UTF8;
var16 = grub_calloc (len16 + 1, sizeof (var16[0])); var16 = grub_calloc (len16 + 1, sizeof (var16[0]));
if (!var16) if (!var16)
return NULL; return GRUB_EFI_OUT_OF_RESOURCES;
len16 = grub_utf8_to_utf16 (var16, len16, (grub_uint8_t *) var, len, NULL); len16 = grub_utf8_to_utf16 (var16, len16, (grub_uint8_t *) var, len, NULL);
var16[len16] = 0; var16[len16] = 0;
@ -251,14 +252,14 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
if (status != GRUB_EFI_BUFFER_TOO_SMALL || !datasize) if (status != GRUB_EFI_BUFFER_TOO_SMALL || !datasize)
{ {
grub_free (var16); grub_free (var16);
return NULL; return status;
} }
data = grub_malloc (datasize); data = grub_malloc (datasize);
if (!data) if (!data)
{ {
grub_free (var16); grub_free (var16);
return NULL; 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, NULL, &datasize, data);
@ -266,12 +267,13 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
if (status == GRUB_EFI_SUCCESS) if (status == GRUB_EFI_SUCCESS)
{ {
*data_out = data;
*datasize_out = datasize; *datasize_out = datasize;
return data; return status;
} }
grub_free (data); grub_free (data);
return NULL; return status;
} }
#pragma GCC diagnostic ignored "-Wcast-align" #pragma GCC diagnostic ignored "-Wcast-align"

2
grub-core/video/efi_gop.c
View File

@ -316,7 +316,7 @@ grub_video_gop_get_edid (struct grub_video_edid_info *edid_info)
char edidname[] = "agp-internal-edid"; char edidname[] = "agp-internal-edid";
grub_size_t datasize; grub_size_t datasize;
grub_uint8_t *data; grub_uint8_t *data;
data = grub_efi_get_variable (edidname, &efi_var_guid, &datasize); grub_efi_get_variable (edidname, &efi_var_guid, &datasize, (void **) &data);
if (data && datasize > 16) if (data && datasize > 16)
{ {
copy_size = datasize - 16; copy_size = datasize - 16;

7
include/grub/efi/efi.h
View File

@ -74,9 +74,10 @@ grub_err_t EXPORT_FUNC (grub_efi_set_virtual_address_map) (grub_efi_uintn_t memo
grub_efi_uintn_t descriptor_size, grub_efi_uintn_t descriptor_size,
grub_efi_uint32_t descriptor_version, grub_efi_uint32_t descriptor_version,
grub_efi_memory_descriptor_t *virtual_map); grub_efi_memory_descriptor_t *virtual_map);
void *EXPORT_FUNC (grub_efi_get_variable) (const char *variable, grub_efi_status_t EXPORT_FUNC (grub_efi_get_variable) (const char *variable,
const grub_efi_guid_t *guid, const grub_efi_guid_t *guid,
grub_size_t *datasize_out); grub_size_t *datasize_out,
void **data_out);
grub_err_t grub_err_t
EXPORT_FUNC (grub_efi_set_variable) (const char *var, EXPORT_FUNC (grub_efi_set_variable) (const char *var,
const grub_efi_guid_t *guid, const grub_efi_guid_t *guid,