2014-09-29 13:54:15 +00:00
|
|
|
From 20c2732c1d6dcaebbcb31c74166bd443de6ca707 Mon Sep 17 00:00:00 2001
|
2014-08-20 17:22:24 +00:00
|
|
|
From: Josh Boyer <jwboyer@fedoraproject.org>
|
|
|
|
|
Date: Tue, 27 Aug 2013 13:33:03 -0400
|
|
|
|
|
Subject: [PATCH] efi: Add EFI_SECURE_BOOT bit
|
|
|
|
|
|
|
|
|
|
UEFI machines can be booted in Secure Boot mode. Add a EFI_SECURE_BOOT bit
|
|
|
|
|
for use with efi_enabled.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
|
|
|
|
|
---
|
|
|
|
|
arch/x86/kernel/setup.c | 2 ++
|
|
|
|
|
include/linux/efi.h | 1 +
|
|
|
|
|
2 files changed, 3 insertions(+)
|
|
|
|
|
|
|
|
|
|
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
|
|
|
|
|
index 5a5cf7395724..fb282ff6a802 100644
|
|
|
|
|
--- a/arch/x86/kernel/setup.c
|
|
|
|
|
+++ b/arch/x86/kernel/setup.c
|
|
|
|
|
@@ -1144,7 +1144,9 @@ void __init setup_arch(char **cmdline_p)
|
|
|
|
|
|
|
|
|
|
#ifdef CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE
|
|
|
|
|
if (boot_params.secure_boot) {
|
|
|
|
|
+ set_bit(EFI_SECURE_BOOT, &efi.flags);
|
|
|
|
|
enforce_signed_modules();
|
|
|
|
|
+ pr_info("Secure boot enabled\n");
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
diff --git a/include/linux/efi.h b/include/linux/efi.h
|
|
|
|
|
index 45cb4ffdea62..ebe6a24cc1e1 100644
|
|
|
|
|
--- a/include/linux/efi.h
|
|
|
|
|
+++ b/include/linux/efi.h
|
|
|
|
|
@@ -923,6 +923,7 @@ extern int __init efi_setup_pcdp_console(char *);
|
|
|
|
|
#define EFI_64BIT 5 /* Is the firmware 64-bit? */
|
|
|
|
|
#define EFI_PARAVIRT 6 /* Access is via a paravirt interface */
|
|
|
|
|
#define EFI_ARCH_1 7 /* First arch-specific bit */
|
|
|
|
|
+#define EFI_SECURE_BOOT 8 /* Are we in Secure Boot mode? */
|
|
|
|
|
|
|
|
|
|
#ifdef CONFIG_EFI
|
|
|
|
|
/*
|
|
|
|
|
--
|
|
|
|
|
1.9.3
|
|
|
|
|
|
