diff options
| author | Alexander Egorenkov <egorenar@linux.ibm.com> | 2024-05-10 12:41:26 +0200 |
|---|---|---|
| committer | Alexander Gordeev <agordeev@linux.ibm.com> | 2024-05-14 20:21:55 +0200 |
| commit | 7faacaeaf6ce12fae78751de5ad869d8f1e1cd7a (patch) | |
| tree | 3e6eeb106d30ed68842ffa61b60c0b80089086f0 | |
| parent | 9c922b73acaf39f867668d9cbe5dc69c23511f84 (diff) | |
| download | lwn-7faacaeaf6ce12fae78751de5ad869d8f1e1cd7a.tar.gz lwn-7faacaeaf6ce12fae78751de5ad869d8f1e1cd7a.zip | |
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: 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>
| -rw-r--r-- | arch/s390/kernel/ipl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c index 73d09cd4c6b0..2f004dfd6131 100644 --- a/arch/s390/kernel/ipl.c +++ b/arch/s390/kernel/ipl.c @@ -1862,9 +1862,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; } |