diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-30 17:31:55 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-30 17:31:55 +0200 |
commit | e11be5e9f76f0b54aa2a38b67b3cf193a0dfae9a (patch) | |
tree | 724e53ad8d5c0f42dc98ddc9e9ab1f39e1e3c542 /0001-efi-Lock-down-the-kernel-if-booted-in-secure-boot-mo.patch | |
parent | 7b32641801900ee7e32065b436d7318c5d7a972e (diff) | |
parent | d176dfce22f5ead7a6018edb69757bc8840cc008 (diff) | |
download | kernel-e11be5e9f76f0b54aa2a38b67b3cf193a0dfae9a.tar.gz kernel-e11be5e9f76f0b54aa2a38b67b3cf193a0dfae9a.tar.xz kernel-e11be5e9f76f0b54aa2a38b67b3cf193a0dfae9a.zip |
merge origin
Diffstat (limited to '0001-efi-Lock-down-the-kernel-if-booted-in-secure-boot-mo.patch')
-rw-r--r-- | 0001-efi-Lock-down-the-kernel-if-booted-in-secure-boot-mo.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/0001-efi-Lock-down-the-kernel-if-booted-in-secure-boot-mo.patch b/0001-efi-Lock-down-the-kernel-if-booted-in-secure-boot-mo.patch index 70fc76355..3d262ba84 100644 --- a/0001-efi-Lock-down-the-kernel-if-booted-in-secure-boot-mo.patch +++ b/0001-efi-Lock-down-the-kernel-if-booted-in-secure-boot-mo.patch @@ -27,12 +27,12 @@ index 28d43754aeb6..19d57bfc12f9 100644 #include <linux/tboot.h> +#include <linux/security.h> #include <linux/usb/xhci-dbgp.h> - + #include <uapi/linux/mount.h> @@ -1105,6 +1106,13 @@ void __init setup_arch(char **cmdline_p) if (efi_enabled(EFI_BOOT)) efi_init(); - + + efi_set_secure_boot(boot_params.secure_boot); + +#ifdef CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT @@ -41,7 +41,7 @@ index 28d43754aeb6..19d57bfc12f9 100644 +#endif + dmi_setup(); - + /* diff --git a/security/lockdown/Kconfig b/security/lockdown/Kconfig index e84ddf484010..d0501353a4b9 100644 @@ -50,7 +50,7 @@ index e84ddf484010..d0501353a4b9 100644 @@ -16,6 +16,19 @@ config SECURITY_LOCKDOWN_LSM_EARLY subsystem is fully initialised. If enabled, lockdown will unconditionally be called before any other LSMs. - + +config LOCK_DOWN_IN_EFI_SECURE_BOOT + bool "Lock down the kernel in EFI Secure Boot mode" + default n @@ -68,5 +68,5 @@ index e84ddf484010..d0501353a4b9 100644 prompt "Kernel default lockdown mode" default LOCK_DOWN_KERNEL_FORCE_NONE -- -2.25.4 +2.26.2 |