Skip to content

Commit

Permalink
s390/ipl: avoid adding scpdata to cmdline during ftp/dvd boot
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Vasily Gorbik authored and Martin Schwidefsky committed Apr 10, 2018
1 parent a0832b3 commit ecc0df0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/s390/kernel/ipl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit ecc0df0

Please sign in to comment.