Skip to contentSkip to conversation

efi: Secure Boot fixes

PATCH In review Daniel Kiper 2 participants 4 messages Jun 30, 2023 – Jul 3, 2023

lore
Share & tools
lore
#0 lore raw

v3 cover efi: Secure Boot fixes

Hi,

Here are two fixes for Secure Boot issues reported recently. This version of patch set adds comment to shim_lock->verify() function prototype and updates patch #1 commit message as it was suggested by Glenn. Please review and test.

Daniel

Daniel Kiper (2):
efi: Drop __grub_efi_api attribute from shim_lock->verify() function
efi: Fallback to legacy mode if shim is loaded on x86 archs

 grub-core/kern/efi/sb.c      | 10 ++++++++++
 grub-core/loader/efi/linux.c | 17 +++++++++++++++++
 include/grub/efi/api.h       |  6 +++++-
 include/grub/efi/sb.h        |  5 ++++-
 4 files changed, 36 insertions(+), 2 deletions(-)
#1 lore raw

PATCH v3 1/2 efi: Drop __grub_efi_api attribute from shim_lock->verify() function

... because (surprisingly) it does not use specific EFI calling convention...

Fixes 6a080b9cd (efi: Add calling convention annotation to all prototypes)
---
 include/grub/efi/api.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
include/grub/efi/api.h +5 -1
index 16161e1f0..d3eaef3fb 100644
@@ -1777,7 +1777,11 @@ typedef struct grub_efi_block_io grub_efi_block_io_t;
 
 struct grub_efi_shim_lock_protocol
 {
-  grub_efi_status_t (__grub_efi_api *verify) (void *buffer, grub_uint32_t size);
+  /*
+   * verify() function (surprisingly) does not use specific EFI calling convention.
+   * So, it does not need to be tagged with __grub_efi_api attribute.
+   */
+  grub_efi_status_t (*verify) (void *buffer, grub_uint32_t size);
 };
 typedef struct grub_efi_shim_lock_protocol grub_efi_shim_lock_protocol_t;
 
Signature · 1 line
2.11.0
#2 lore raw

PATCH v3 2/2 efi: Fallback to legacy mode if shim is loaded on x86 archs

In reply to Daniel Kiper

The LoadImage() provided by the shim does not consult MOK when loading an image. So, simply signature verification fails when it should not. This means we cannot use Linux EFI stub to start the kernel when the shim is loaded. We have to fallback to legacy mode on x86 architectures. This is not possible on other architectures due to lack of legacy mode.

This is workaround which should disappear when the shim provides LoadImage() which looks up MOK during signature verification.

On the occasion align constants in include/grub/efi/sb.h.

---
 grub-core/kern/efi/sb.c      | 10 ++++++++++
 grub-core/loader/efi/linux.c | 17 +++++++++++++++++
 include/grub/efi/sb.h        |  5 ++++-
 3 files changed, 31 insertions(+), 1 deletion(-)
grub-core/kern/efi/sb.c +10 -0
index 80cfa0888..60550a6da 100644
@@ -32,6 +32,8 @@
 
 static grub_guid_t shim_lock_guid = GRUB_EFI_SHIM_LOCK_GUID;
 
+static bool shim_lock_enabled = false;
+
 /*
  * Determine whether we're in secure boot mode.
  *
@@ -215,6 +217,14 @@ grub_shim_lock_verifier_setup (void)
   /* Enforce shim_lock_verifier. */
   grub_verifier_register (&shim_lock_verifier);
 
+  shim_lock_enabled = true;
+
   grub_env_set ("shim_lock", "y");
   grub_env_export ("shim_lock");
 }
+
+bool
+grub_is_shim_lock_enabled (void)
+{
+  return shim_lock_enabled;
+}
grub-core/loader/efi/linux.c +17 -0
index c1eef7c98..fb4d12e3f 100644
@@ -29,6 +29,7 @@
 #include <grub/efi/fdtload.h>
 #include <grub/efi/memory.h>
 #include <grub/efi/pe32.h>
+#include <grub/efi/sb.h>
 #include <grub/i18n.h>
 #include <grub/lib/cmdline.h>
 #include <grub/verify.h>
@@ -458,6 +459,22 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
 
   grub_dl_ref (my_mod);
 
+  if (grub_is_shim_lock_enabled () == true)
+    {
+#if defined(__i386__) || defined(__x86_64__)
+      grub_dprintf ("linux", "shim_lock enabled, falling back to legacy Linux kernel loader\n");
+
+      err = grub_cmd_linux_x86_legacy (cmd, argc, argv);
+
+      if (err == GRUB_ERR_NONE)
+	return GRUB_ERR_NONE;
+      else
+	goto fail;
+#else
+      grub_dprintf ("linux", "shim_lock enabled, trying Linux kernel EFI stub loader\n");
+#endif
+    }
+
   if (argc == 0)
     {
       grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
include/grub/efi/sb.h +4 -1
index 30c4335bb..49a9ad01c 100644
@@ -22,7 +22,7 @@
 #include <grub/types.h>
 #include <grub/dl.h>
 
-#define GRUB_EFI_SECUREBOOT_MODE_UNSET	0
+#define GRUB_EFI_SECUREBOOT_MODE_UNSET		0
 #define GRUB_EFI_SECUREBOOT_MODE_UNKNOWN	1
 #define GRUB_EFI_SECUREBOOT_MODE_DISABLED	2
 #define GRUB_EFI_SECUREBOOT_MODE_ENABLED	3
@@ -31,6 +31,9 @@
 extern grub_uint8_t
 EXPORT_FUNC (grub_efi_get_secureboot) (void);
 
+extern bool
+EXPORT_FUNC (grub_is_shim_lock_enabled) (void);
+
 extern void
 grub_shim_lock_verifier_setup (void);
 #else
Signature · 1 line
2.11.0
Reviewed-by on the v3 series
#3 lore raw
In reply to Daniel Kiper
Quoted 7 lines · Daniel Kiper

Hi,

Here are two fixes for Secure Boot issues reported recently. This version of patch set adds comment to shim_lock->verify() function prototype and updates patch #1 commit message as it was suggested by Glenn. Please review and test.

Quoted 6 lines

Daniel

Daniel Kiper (2):
efi: Drop __grub_efi_api attribute from shim_lock->verify() function
efi: Fallback to legacy mode if shim is loaded on x86 archs

For the series,

Quoted 6 lines
 grub-core/kern/efi/sb.c      | 10 ++++++++++
 grub-core/loader/efi/linux.c | 17 +++++++++++++++++
 include/grub/efi/api.h       |  6 +++++-
 include/grub/efi/sb.h        |  5 ++++-
 4 files changed, 36 insertions(+), 2 deletions(-)