0031-efi-Add-a-function-to-read-EFI-variables-with-attrib.patch 3.1 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778
  1. From ac5c9367548750e75ed1e7fc4354a3d20186d733 Mon Sep 17 00:00:00 2001
  2. From: Daniel Kiper <daniel.kiper@oracle.com>
  3. Date: Thu, 3 Dec 2020 16:01:47 +0100
  4. Subject: [PATCH] efi: Add a function to read EFI variables with attributes
  5. It will be used to properly detect and report UEFI Secure Boot status to
  6. the x86 Linux kernel. The functionality will be added by subsequent patches.
  7. Signed-off-by: Ignat Korchagin <ignat@cloudflare.com>
  8. Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
  9. Signed-off-by: Marco A Benatto <mbenatto@redhat.com>
  10. Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
  11. Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
  12. ---
  13. grub-core/kern/efi/efi.c | 16 +++++++++++++---
  14. include/grub/efi/efi.h | 5 +++++
  15. 2 files changed, 18 insertions(+), 3 deletions(-)
  16. diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
  17. index 9403b12cd..2942b8e35 100644
  18. --- a/grub-core/kern/efi/efi.c
  19. +++ b/grub-core/kern/efi/efi.c
  20. @@ -224,8 +224,11 @@ grub_efi_set_variable(const char *var, const grub_efi_guid_t *guid,
  21. }
  22. grub_efi_status_t
  23. -grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
  24. - grub_size_t *datasize_out, void **data_out)
  25. +grub_efi_get_variable_with_attributes (const char *var,
  26. + const grub_efi_guid_t *guid,
  27. + grub_size_t *datasize_out,
  28. + void **data_out,
  29. + grub_efi_uint32_t *attributes)
  30. {
  31. grub_efi_status_t status;
  32. grub_efi_uintn_t datasize = 0;
  33. @@ -262,7 +265,7 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
  34. return GRUB_EFI_OUT_OF_RESOURCES;
  35. }
  36. - status = efi_call_5 (r->get_variable, var16, guid, NULL, &datasize, data);
  37. + status = efi_call_5 (r->get_variable, var16, guid, attributes, &datasize, data);
  38. grub_free (var16);
  39. if (status == GRUB_EFI_SUCCESS)
  40. @@ -276,6 +279,13 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
  41. return status;
  42. }
  43. +grub_efi_status_t
  44. +grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
  45. + grub_size_t *datasize_out, void **data_out)
  46. +{
  47. + return grub_efi_get_variable_with_attributes (var, guid, datasize_out, data_out, NULL);
  48. +}
  49. +
  50. #pragma GCC diagnostic ignored "-Wcast-align"
  51. /* Search the mods section from the PE32/PE32+ image. This code uses
  52. diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
  53. index 8b2a0f1f5..83d958f99 100644
  54. --- a/include/grub/efi/efi.h
  55. +++ b/include/grub/efi/efi.h
  56. @@ -74,6 +74,11 @@ grub_err_t EXPORT_FUNC (grub_efi_set_virtual_address_map) (grub_efi_uintn_t memo
  57. grub_efi_uintn_t descriptor_size,
  58. grub_efi_uint32_t descriptor_version,
  59. grub_efi_memory_descriptor_t *virtual_map);
  60. +grub_efi_status_t EXPORT_FUNC (grub_efi_get_variable_with_attributes) (const char *variable,
  61. + const grub_efi_guid_t *guid,
  62. + grub_size_t *datasize_out,
  63. + void **data_out,
  64. + grub_efi_uint32_t *attributes);
  65. grub_efi_status_t EXPORT_FUNC (grub_efi_get_variable) (const char *variable,
  66. const grub_efi_guid_t *guid,
  67. grub_size_t *datasize_out,
  68. --
  69. 2.29.2