From: Vasily Gorbik <gor@linux.ibm.com>
Date: Mon, 1 Apr 2019 17:11:08 +0000 (+0200)
Subject: s390/protvirt: block kernel command line alteration
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=093ddccb55157f909f203f9e50bce0c24431e791;p=linux.git

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>
---

diff --git a/arch/s390/boot/ipl_parm.c b/arch/s390/boot/ipl_parm.c
index 385d0c7a96352..1900670a83fdc 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();
 }