diff options
| author | Klaus Jensen <k.jensen@samsung.com> | 2023-08-08 17:16:13 +0200 |
|---|---|---|
| committer | Klaus Jensen <k.jensen@samsung.com> | 2023-08-09 15:32:32 +0200 |
| commit | 6c8f8456cb0b239812dee5211881426496da7b98 (patch) | |
| tree | 285f5438b98bde0784a508cc35e18225a89b4275 /hw/nvme/ctrl.c | |
| parent | a8fc5165aab02f328ccd148aafec1e59fd1426eb (diff) | |
| download | focaccia-qemu-6c8f8456cb0b239812dee5211881426496da7b98.tar.gz focaccia-qemu-6c8f8456cb0b239812dee5211881426496da7b98.zip | |
hw/nvme: fix null pointer access in directive receive
nvme_directive_receive() does not check if an endurance group has been
configured (set) prior to testing if flexible data placement is enabled
or not.
Fix this.
Cc: qemu-stable@nongnu.org
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1815
Fixes: 73064edfb864 ("hw/nvme: flexible data placement emulation")
Reviewed-by: Jesper Wendel Devantier <j.devantier@samsung.com>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Diffstat (limited to 'hw/nvme/ctrl.c')
| -rw-r--r-- | hw/nvme/ctrl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index d217ae91b5..e5b5c7034d 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -6900,7 +6900,7 @@ static uint16_t nvme_directive_receive(NvmeCtrl *n, NvmeRequest *req) case NVME_DIRECTIVE_IDENTIFY: switch (doper) { case NVME_DIRECTIVE_RETURN_PARAMS: - if (ns->endgrp->fdp.enabled) { + if (ns->endgrp && ns->endgrp->fdp.enabled) { id.supported |= 1 << NVME_DIRECTIVE_DATA_PLACEMENT; id.enabled |= 1 << NVME_DIRECTIVE_DATA_PLACEMENT; id.persistent |= 1 << NVME_DIRECTIVE_DATA_PLACEMENT; |