[UNSTABLE,EOAN] UBUNTU: SAUCE: (lockdown) s390/setup: Actually init kernel lock down
diff mbox series

Message ID 20190913230504.6168-1-xnox@ubuntu.com
State New
Headers show
Series
  • [UNSTABLE,EOAN] UBUNTU: SAUCE: (lockdown) s390/setup: Actually init kernel lock down
Related show

Commit Message

Dimitri John Ledkov Sept. 13, 2019, 11:05 p.m. UTC
From: Philipp Rudo <prudo@linux.ibm.com>

BugLink: https://bugs.launchpad.net/bugs/1843961

Kernel lock down isn't initalized in common but in arch code. So
initialize it for s390 as well.

Signed-off-by: Philipp Rudo <prudo@linux.ibm.com>
Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>
---
 arch/s390/kernel/setup.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Seth Forshee Sept. 16, 2019, 12:58 p.m. UTC | #1
On Sat, Sep 14, 2019 at 12:05:04AM +0100, Dimitri John Ledkov wrote:
> From: Philipp Rudo <prudo@linux.ibm.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/1843961
> 
> Kernel lock down isn't initalized in common but in arch code. So
> initialize it for s390 as well.
> 
> Signed-off-by: Philipp Rudo <prudo@linux.ibm.com>
> Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>

Applied to eoan/master-next, thanks!

Patch
diff mbox series

diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 253177900950..2ba122f1dd4f 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -49,6 +49,7 @@ 
 #include <linux/memory.h>
 #include <linux/compat.h>
 #include <linux/start_kernel.h>
+#include <linux/security.h>
 
 #include <asm/boot_data.h>
 #include <asm/ipl.h>
@@ -1107,6 +1108,7 @@  void __init setup_arch(char **cmdline_p)
 		pr_info("Linux is running as a guest in 64-bit mode\n");
 
 	log_component_list();
+	init_lockdown();
 
 	/* Have one command line that is parsed and saved in /proc/cmdline */
 	/* boot_command_line has been already set up in early.c */