From: Vasily Gorbik <gor@linux.ibm.com>
Date: Tue, 3 Apr 2018 14:03:25 +0000 (+0200)
Subject: s390/ipl: avoid adding scpdata to cmdline during ftp/dvd boot
X-Git-Tag: v4.17-rc1~26^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ecc0df0f23cb5f83ee580a8d1d818524955cbc97;p=thirdparty%2Fkernel%2Flinux.git

s390/ipl: avoid adding scpdata to cmdline during ftp/dvd boot

Add missing ipl parmblock validity check to append_ipl_scpdata.

Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
index a97bc16e3d1ae..39572ee8e2a7d 100644
--- a/arch/s390/kernel/ipl.c
+++ b/arch/s390/kernel/ipl.c
@@ -397,7 +397,7 @@ size_t append_ipl_scpdata(char *dest, size_t len)
 	size_t rc;
 
 	rc = 0;
-	if (ipl_block.hdr.pbt == DIAG308_IPL_TYPE_FCP)
+	if (ipl_block_valid && ipl_block.hdr.pbt == DIAG308_IPL_TYPE_FCP)
 		rc = reipl_append_ascii_scpdata(dest, len, &ipl_block);
 	else
 		dest[0] = 0;