efi: Add EFI_SECURE_BOOT bit

UEFI machines can be booted in Secure Boot mode.  Add a EFI_SECURE_BOOT bit
that can be passed to efi_enabled() to find out whether secure boot is
enabled.

This will be used by the SysRq+x handler, registered by the x86 arch, to find
out whether secure boot mode is enabled so that it can be disabled.

Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
Signed-off-by: David Howells <dhowells@redhat.com>
Gbp-Pq: Topic features/all/lockdown
Gbp-Pq: Name 0038-efi-Add-EFI_SECURE_BOOT-bit.patch

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 36646f19d40b78a4456bf005c8245f4132962223..87ef54e6484239ad86f011b639306671989be2f8 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -1190,6 +1190,7 @@ void __init setup_arch(char **cmdline_p)
                        pr_info("Secure boot disabled\n");
                        break;
                case efi_secureboot_mode_enabled:
+                       set_bit(EFI_SECURE_BOOT, &efi.flags);
                        pr_info("Secure boot enabled\n");
                        break;
                default:

diff --git a/include/linux/efi.h b/include/linux/efi.h
index ec36f42a2adde07cd9ca9b37ddaaf9442dccee31..381b3f6670d379626d1ee90628d2035342ab1c98 100644 (file)
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -1069,6 +1069,7 @@ extern int __init efi_setup_pcdp_console(char *);
 #define EFI_DBG                        8       /* Print additional debug info at runtime */
 #define EFI_NX_PE_DATA         9       /* Can runtime data regions be mapped non-executable? */
 #define EFI_MEM_ATTR           10      /* Did firmware publish an EFI_MEMORY_ATTRIBUTES table? */
+#define EFI_SECURE_BOOT                11      /* Are we in Secure Boot mode? */
 
 #ifdef CONFIG_EFI
 /*