summaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorVasily Gorbik <gor@linux.ibm.com>2019-04-01 19:11:08 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2019-04-10 17:47:22 +0200
commit093ddccb55157f909f203f9e50bce0c24431e791 (patch)
tree6054e991d886fc21f2387fb66d7ed2f9640646b1 /arch/s390
parents390/protvirt: add memory sharing for diag 308 set/store (diff)
downloadlinux-093ddccb55157f909f203f9e50bce0c24431e791.tar.xz
linux-093ddccb55157f909f203f9e50bce0c24431e791.zip
s390/protvirt: block kernel command line alteration
Disallow kernel command line alteration via ipl parameter block if running in protected virtualization environment. Signed-off-by: Vasily Gorbik <gor@linux.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/boot/ipl_parm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/boot/ipl_parm.c b/arch/s390/boot/ipl_parm.c
index 385d0c7a9635..1900670a83fd 100644
--- a/arch/s390/boot/ipl_parm.c
+++ b/arch/s390/boot/ipl_parm.c
@@ -144,7 +144,7 @@ void setup_boot_command_line(void)
strcpy(early_command_line, strim(COMMAND_LINE));
/* append IPL PARM data to the boot command line */
- if (ipl_block_valid)
+ if (!is_prot_virt_guest() && ipl_block_valid)
append_ipl_block_parm();
}