]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
nvme-pci: fix out-of-bounds access in nvme_setup_descriptor_pools
authorMateusz Nowicki <mateusz.nowicki@posteo.net>
Sat, 23 May 2026 08:28:16 +0000 (08:28 +0000)
committerKeith Busch <kbusch@kernel.org>
Wed, 27 May 2026 16:28:20 +0000 (09:28 -0700)
nvme_setup_descriptor_pools() indexes dev->descriptor_pools[] using the
numa_node forwarded from hctx->numa_node by its single caller,
nvme_init_hctx_common().  On a non-NUMA kernel hctx->numa_node is
NUMA_NO_NODE (-1).  Because the parameter was declared 'unsigned', the
value becomes UINT_MAX and the index walks off the array (sized to
nr_node_ids), faulting during nvme_alloc_ns() and leaving the namespace
without a /dev node.

Reproduces on any NVMe controller probed by a CONFIG_NUMA=n kernel:

  BUG: unable to handle page fault for address: ffff889101603d38
  RIP: 0010:nvme_init_hctx_common+0x5a/0x190 [nvme]
  Call Trace:
   nvme_init_hctx+0x10/0x20 [nvme]
   nvme_alloc_ns+0x9e/0xa10 [nvme_core]
   nvme_scan_ns+0x301/0x3b0 [nvme_core]
   nvme_scan_ns_async+0x23/0x30 [nvme_core]

Switch the parameter to int and fall back to node 0 when it is
NUMA_NO_NODE; node 0 is always present.

Fixes: d977506f8863 ("nvme-pci: make PRP list DMA pools per-NUMA-node")
Link: https://lore.kernel.org/r/20260309062840.2937858-2-iam@sung-woo.kim
Reported-by: Sung-woo Kim <iam@sung-woo.kim>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Mateusz Nowicki <mateusz.nowicki@posteo.net>
Signed-off-by: Keith Busch <kbusch@kernel.org>
drivers/nvme/host/pci.c

index 35affda088f4cfd23b8ebf8d005681b44bbbd8bb..d20d8722ad9673bec0c3bee73e131c15c3aa1319 100644 (file)
@@ -587,11 +587,16 @@ static bool nvme_dbbuf_update_and_check_event(u16 value, __le32 *dbbuf_db,
 }
 
 static struct nvme_descriptor_pools *
-nvme_setup_descriptor_pools(struct nvme_dev *dev, unsigned numa_node)
+nvme_setup_descriptor_pools(struct nvme_dev *dev, int numa_node)
 {
-       struct nvme_descriptor_pools *pools = &dev->descriptor_pools[numa_node];
+       struct nvme_descriptor_pools *pools;
        size_t small_align = NVME_SMALL_POOL_SIZE;
 
+       if (numa_node == NUMA_NO_NODE)
+               numa_node = 0;
+
+       pools = &dev->descriptor_pools[numa_node];
+
        if (pools->small)
                return pools; /* already initialized */