Skip to content

Commit 7faacae

Browse files
eaibmzAlexander Gordeev
authored andcommitted
s390/ipl: Fix incorrect initialization of nvme dump block
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: d70e38c ("s390: nvme dump support") Reviewed-by: Heiko Carstens <[email protected]> Signed-off-by: Alexander Egorenkov <[email protected]> Signed-off-by: Alexander Gordeev <[email protected]>
1 parent 9c922b7 commit 7faacae

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

arch/s390/kernel/ipl.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1862,9 +1862,9 @@ static int __init dump_nvme_init(void)
18621862
}
18631863
dump_block_nvme->hdr.len = IPL_BP_NVME_LEN;
18641864
dump_block_nvme->hdr.version = IPL_PARM_BLOCK_VERSION;
1865-
dump_block_nvme->fcp.len = IPL_BP0_NVME_LEN;
1866-
dump_block_nvme->fcp.pbt = IPL_PBT_NVME;
1867-
dump_block_nvme->fcp.opt = IPL_PB0_NVME_OPT_DUMP;
1865+
dump_block_nvme->nvme.len = IPL_BP0_NVME_LEN;
1866+
dump_block_nvme->nvme.pbt = IPL_PBT_NVME;
1867+
dump_block_nvme->nvme.opt = IPL_PB0_NVME_OPT_DUMP;
18681868
dump_capabilities |= DUMP_TYPE_NVME;
18691869
return 0;
18701870
}

0 commit comments

Comments
 (0)