summaryrefslogtreecommitdiffstats
path: root/0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2020-06-30 09:24:22 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2020-06-30 09:24:22 -0500
commitd176dfce22f5ead7a6018edb69757bc8840cc008 (patch)
treeaa15398098e0f20a9fb643441ec8443b2ffd6328 /0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch
parent61b5e2fd06a4be7134afb1cd363002e015123f7f (diff)
downloadkernel-d176dfce22f5ead7a6018edb69757bc8840cc008.tar.gz
kernel-d176dfce22f5ead7a6018edb69757bc8840cc008.tar.xz
kernel-d176dfce22f5ead7a6018edb69757bc8840cc008.zip
kernel-5.8.0-0.rc3.20200630git7c30b859a947.1
* Tue Jun 30 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc3.20200630git7c30b859a947.1] - 7c30b859a947 rebase - Updated changelog for the release based on v5.8-rc3 (Fedora Kernel Team) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to '0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch')
-rw-r--r--0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch b/0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch
index e8f8e2c33..0b2bae28d 100644
--- a/0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch
+++ b/0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch
@@ -24,7 +24,7 @@ index 7d5cfdda5277..be66ee5d0437 100644
int ipl_report_add_certificate(struct ipl_report *report, void *key,
unsigned long addr, unsigned long len);
+bool ipl_get_secureboot(void);
-
+
/*
* DIAG 308 support
diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
@@ -33,7 +33,7 @@ index 90a2a17239b0..be3b72c53656 100644
+++ b/arch/s390/kernel/ipl.c
@@ -2110,3 +2110,8 @@ int ipl_report_free(struct ipl_report *report)
}
-
+
#endif
+
+bool ipl_get_secureboot(void)
@@ -49,13 +49,13 @@ index 5853c9872dfe..fab9bc9889da 100644
#include <linux/compat.h>
#include <linux/start_kernel.h>
+#include <linux/security.h>
-
+
#include <asm/boot_data.h>
#include <asm/ipl.h>
@@ -1086,6 +1087,9 @@ void __init setup_arch(char **cmdline_p)
-
+
log_component_list();
-
+
+ if (ipl_get_secureboot())
+ security_lock_kernel_down("Secure IPL mode", LOCKDOWN_INTEGRITY_MAX);
+
@@ -63,5 +63,5 @@ index 5853c9872dfe..fab9bc9889da 100644
/* boot_command_line has been already set up in early.c */
*cmdline_p = boot_command_line;
--
-2.25.4
+2.26.2