Commit 63c9653696 for qemu.org

commit 63c9653696862f55646fa7a88833857cabb6a07d
Author: Klaus Jensen <k.jensen@samsung.com>
Date:   Tue Nov 17 08:53:11 2026 +0100

    hw/nvme: fix zone descriptor extension allocation overflow

    nvme_ns_zoned_init_state sizes the zone descriptor extension array
    with 32-bit arithmetic. A large enough zone extension size and number of
    zones will wrap, causing either null pointer deref on Set Zone
    Descriptor Extension or an out-of-bounds write.

    nvme_get_zd_extension has the same problem.

    Fix the initialization by using g_malloc0_n and compute the per-zone
    offset using 64-bit arithmetic.

    Cc: qemu-stable@nongnu.org
    Fixes: 1a9290ade33a ("hw/block/nvme: Support Zone Descriptor Extensions")
    Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/4730
    Reported-by: Karl Mehltretter
    Reviewed-by: Jesper Wendel Devantier <foss@defmacro.it>
    Signed-off-by: Klaus Jensen <k.jensen@samsung.com>

diff --git a/hw/nvme/ns.c b/hw/nvme/ns.c
index 37d45bb4d5..b18fcab43b 100644
--- a/hw/nvme/ns.c
+++ b/hw/nvme/ns.c
@@ -314,8 +314,8 @@ static void nvme_ns_zoned_init_state(NvmeNamespace *ns)

     ns->zone_array = g_new0(NvmeZone, ns->num_zones);
     if (ns->params.zd_extension_size) {
-        ns->zd_extensions = g_malloc0(ns->params.zd_extension_size *
-                                      ns->num_zones);
+        ns->zd_extensions = g_malloc0_n(ns->num_zones,
+                                        ns->params.zd_extension_size);
     }

     QTAILQ_INIT(&ns->exp_open_zones);
diff --git a/hw/nvme/nvme.h b/hw/nvme/nvme.h
index a4b2c01a2c..1bfe85c10d 100644
--- a/hw/nvme/nvme.h
+++ b/hw/nvme/nvme.h
@@ -363,7 +363,8 @@ static inline bool nvme_wp_is_valid(NvmeZone *zone)
 static inline uint8_t *nvme_get_zd_extension(NvmeNamespace *ns,
                                              uint32_t zone_idx)
 {
-    return &ns->zd_extensions[zone_idx * ns->params.zd_extension_size];
+    return ns->zd_extensions + (uint64_t)zone_idx *
+        ns->params.zd_extension_size;
 }

 static inline void nvme_aor_inc_open(NvmeNamespace *ns)