]> www.infradead.org Git - nvme.git/commitdiff
nvmet: fix out-of-bounds access in nvmet_enable_port nvme-6.15 nvme-6.15-2025-04-24
authorRichard Weinberger <richard@nod.at>
Fri, 18 Apr 2025 08:02:50 +0000 (10:02 +0200)
committerChristoph Hellwig <hch@lst.de>
Tue, 22 Apr 2025 07:50:28 +0000 (09:50 +0200)
When trying to enable a port that has no transport configured yet,
nvmet_enable_port() uses NVMF_TRTYPE_MAX (255) to query the transports
array, causing an out-of-bounds access:

[  106.058694] BUG: KASAN: global-out-of-bounds in nvmet_enable_port+0x42/0x1da
[  106.058719] Read of size 8 at addr ffffffff89dafa58 by task ln/632
[...]
[  106.076026] nvmet: transport type 255 not supported

Since commit 200adac75888, NVMF_TRTYPE_MAX is the default state as configured by
nvmet_ports_make().
Avoid this by checking for NVMF_TRTYPE_MAX before proceeding.

Fixes: 200adac75888 ("nvme: Add PCI transport type")
Signed-off-by: Richard Weinberger <richard@nod.at>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
drivers/nvme/target/core.c

index 71f8d06998d60251ea96ca675ac4a90d99d7c81f..245475c43127fb4275c8458a0bd4471764d84fff 100644 (file)
@@ -324,6 +324,9 @@ int nvmet_enable_port(struct nvmet_port *port)
 
        lockdep_assert_held(&nvmet_config_sem);
 
+       if (port->disc_addr.trtype == NVMF_TRTYPE_MAX)
+               return -EINVAL;
+
        ops = nvmet_transports[port->disc_addr.trtype];
        if (!ops) {
                up_write(&nvmet_config_sem);