nvmet: Fix out-of-bounds access in nvmet_enable_port

[PATCH] nvmet: Fix out-of-bounds access in nvmet_enable_port

Posted by Richard Weinberger 7 months, 4 weeks ago

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>
---
 drivers/nvme/target/core.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c
index 71f8d06998d6..245475c43127 100644
--- a/drivers/nvme/target/core.c
+++ b/drivers/nvme/target/core.c
@@ -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);
-- 
2.48.1

Re: [PATCH] nvmet: Fix out-of-bounds access in nvmet_enable_port

Posted by Christoph Hellwig 7 months, 3 weeks ago

Thanks,

applied to nvme-6.15.

Re: [PATCH] nvmet: Fix out-of-bounds access in nvmet_enable_port

Posted by Chaitanya Kulkarni 7 months, 3 weeks ago

On 4/18/25 01:02, Richard Weinberger wrote:
> 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>

Looks good.

Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>

-ck

Re: [PATCH] nvmet: Fix out-of-bounds access in nvmet_enable_port

Posted by Sagi Grimberg 7 months, 4 weeks ago

Reviewed-by: Sagi Grimberg <sagi@grimberg.me>

Re: [PATCH] nvmet: Fix out-of-bounds access in nvmet_enable_port

Posted by Damien Le Moal 7 months, 4 weeks ago

On 4/18/25 17:02, Richard Weinberger wrote:
> 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>

My bad :) Thanks for the fix !

Reviewed-by: Damien Le Moal <dlemoal@kernel.org>

-- 
Damien Le Moal
Western Digital Research