diff options
| author | Vasily Gorbik <gor@linux.ibm.com> | 2018-04-03 16:03:25 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2018-04-10 07:38:59 +0200 |
| commit | ecc0df0f23cb5f83ee580a8d1d818524955cbc97 (patch) | |
| tree | 6882dfc1a22546efc3e47791be01526ddd379491 | |
| parent | a0832b3aef5a793e9e04d9a7a4647ac03654ef79 (diff) | |
| download | op-kernel-dev-ecc0df0f23cb5f83ee580a8d1d818524955cbc97.zip op-kernel-dev-ecc0df0f23cb5f83ee580a8d1d818524955cbc97.tar.gz | |
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>
| -rw-r--r-- | arch/s390/kernel/ipl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c index a97bc16..39572ee 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; |
