s390/ipl: Fix incorrect initialization of nvme dump block

[ Upstream commit 7faacaeaf6ce12fae78751de5ad869d8f1e1cd7a ]

Initialize the correct fields of the nvme dump block.
This bug had not been detected before because first, the fcp and nvme fields
of struct ipl_parameter_block are part of the same union and, therefore,
overlap in memory and second, they are identical in structure and size.

Fixes: d70e38cb1dee ("s390: nvme dump support")
Reviewed-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Alexander Egorenkov <egorenar@linux.ibm.com>
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
index 77246ff5b0141cf700c23890c2399e3a18186b64..d2ba82873abfd474ab2bf9306e7d8c1c84cf9d4a 100644 (file)
--- a/arch/s390/kernel/ipl.c
+++ b/arch/s390/kernel/ipl.c
@@ -1603,9 +1603,9 @@ static int __init dump_nvme_init(void)
        }
        dump_block_nvme->hdr.len = IPL_BP_NVME_LEN;
        dump_block_nvme->hdr.version = IPL_PARM_BLOCK_VERSION;
-       dump_block_nvme->fcp.len = IPL_BP0_NVME_LEN;
-       dump_block_nvme->fcp.pbt = IPL_PBT_NVME;
-       dump_block_nvme->fcp.opt = IPL_PB0_NVME_OPT_DUMP;
+       dump_block_nvme->nvme.len = IPL_BP0_NVME_LEN;
+       dump_block_nvme->nvme.pbt = IPL_PBT_NVME;
+       dump_block_nvme->nvme.opt = IPL_PB0_NVME_OPT_DUMP;
        dump_capabilities |= DUMP_TYPE_NVME;
        return 0;
 }