diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-05 08:38:01 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-05 08:38:01 +0200 |
commit | d8b1d4104de663bacffe18cf79ebf37fed8aac78 (patch) | |
tree | 2aceb7beb9cb45d90854d2d8e36ce108864fca46 /0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch | |
parent | 1b44a8c9fe0e71a8d14c49e78d9857f49d518a09 (diff) | |
parent | 9ab9ea2db0b13375d3d7114d5c82eb298a118740 (diff) | |
download | kernel-d8b1d4104de663bacffe18cf79ebf37fed8aac78.tar.gz kernel-d8b1d4104de663bacffe18cf79ebf37fed8aac78.tar.xz kernel-d8b1d4104de663bacffe18cf79ebf37fed8aac78.zip |
merge origin
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.patch | 12 |
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 4332472bb..63cd86b35 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 @@ -16,10 +16,10 @@ Signed-off-by: Jeremy Cline <jcline@redhat.com> 3 files changed, 10 insertions(+) diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h -index b63bd66404b8..3482d9602e68 100644 +index 7d5cfdda5277..be66ee5d0437 100644 --- a/arch/s390/include/asm/ipl.h +++ b/arch/s390/include/asm/ipl.h -@@ -109,6 +109,7 @@ int ipl_report_add_component(struct ipl_report *report, struct kexec_buf *kbuf, +@@ -120,6 +120,7 @@ int ipl_report_add_component(struct ipl_report *report, struct kexec_buf *kbuf, unsigned char flags, unsigned short cert); int ipl_report_add_certificate(struct ipl_report *report, void *key, unsigned long addr, unsigned long len); @@ -28,10 +28,10 @@ index b63bd66404b8..3482d9602e68 100644 /* * DIAG 308 support diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c -index 4a71061974fd..9baf0b570c3d 100644 +index 90a2a17239b0..be3b72c53656 100644 --- a/arch/s390/kernel/ipl.c +++ b/arch/s390/kernel/ipl.c -@@ -1901,3 +1901,8 @@ int ipl_report_free(struct ipl_report *report) +@@ -2110,3 +2110,8 @@ int ipl_report_free(struct ipl_report *report) } #endif @@ -41,7 +41,7 @@ index 4a71061974fd..9baf0b570c3d 100644 + return !!ipl_secure_flag; +} diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c -index 36445dd40fdb..b338a050c5aa 100644 +index 07aa15ba43b3..307abb2d82d7 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -49,6 +49,7 @@ @@ -52,7 +52,7 @@ index 36445dd40fdb..b338a050c5aa 100644 #include <asm/boot_data.h> #include <asm/ipl.h> -@@ -1093,6 +1094,9 @@ void __init setup_arch(char **cmdline_p) +@@ -1086,6 +1087,9 @@ void __init setup_arch(char **cmdline_p) log_component_list(); |