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 a97bc16..39572ee 100644 (file)
--- 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;