From: Klaus Jensen Date: Tue, 8 Aug 2023 15:16:13 +0000 (+0200) Subject: hw/nvme: fix null pointer access in directive receive X-Git-Tag: qemu-xen-4.19.1~50 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=43328764f7a0c4371f0142a8cee6dcdbeecfa633;p=qemu-xen.git 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 Signed-off-by: Klaus Jensen (cherry picked from commit 6c8f8456cb0b239812dee5211881426496da7b98) Signed-off-by: Michael Tokarev --- diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index 00b910ca9e..ac505727e5 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -6877,7 +6877,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;