Commit 034baf047f for qemu.org

commit 034baf047fe143c2713f35fa640407d9da2f6fc3
Author: Keith Busch <kbusch@kernel.org>
Date:   Fri May 29 06:59:47 2026 -0700

    hw/nvme: ensure sgl forward progress

    A degenerate host can create segment loops of zero-byte data descriptors
    that the controller never breaks out of. While the spec allows zero
    length segments, it provides no guidance on handling loops. It
    makes no sense for a host to submit such a descriptor anyway since it
    can and trivially should point to the next transfer segment, so don't
    even try to work with such behavior. Just reject the command,
    terminating the loop.

    Cc: qemu-stable@nongnu.org
    Reported-by: Feifan Qian <bea1e@proton.me>
    Reported-by: boy juju <agx1657748706@gmail.com>
    Signed-off-by: Keith Busch <kbusch@kernel.org>
    Reviewed-by: Klaus Jensen <k.jensen@samsung.com>
    Signed-off-by: Klaus Jensen <k.jensen@samsung.com>

diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
index d60a680dbc..7845e59e4b 100644
--- a/hw/nvme/ctrl.c
+++ b/hw/nvme/ctrl.c
@@ -1090,6 +1090,8 @@ static uint16_t nvme_map_sgl(NvmeCtrl *n, NvmeSg *sg, NvmeSglDescriptor sgl,
     }

     for (;;) {
+        size_t prev_len = len;
+
         switch (NVME_SGL_TYPE(sgld->type)) {
         case NVME_SGL_DESCR_TYPE_SEGMENT:
         case NVME_SGL_DESCR_TYPE_LAST_SEGMENT:
@@ -1170,6 +1172,17 @@ static uint16_t nvme_map_sgl(NvmeCtrl *n, NvmeSg *sg, NvmeSglDescriptor sgl,
         if (status) {
             goto unmap;
         }
+
+        /*
+         * Reject if this segment made no forward progress. The host should
+         * have skipped linking an empty segment. While not strictly spec
+         * compliant, allowing this makes it easy for a pathological host to
+         * create an infinite loop.
+         */
+        if (len == prev_len) {
+            status = NVME_INVALID_SGL_SEG_DESCR | NVME_DNR;
+            goto unmap;
+        }
     }

 out: