diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-06 12:04:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-06 12:04:06 -0700 |
| commit | b66f0b119c96dbb6b976f1d75b7bf69960069bde (patch) | |
| tree | c53a3213480e1d274b3809d0c6c3fc5a90ee6045 /drivers/nvme/target/tcp.c | |
| parent | 703896be3015db7f8fd8822b18909a5914209a70 (diff) | |
| parent | 4ba032bc71dad8d604d308afffaa16b81816c751 (diff) | |
| download | linux-stable-b66f0b119c96dbb6b976f1d75b7bf69960069bde.tar.gz linux-stable-b66f0b119c96dbb6b976f1d75b7bf69960069bde.tar.bz2 linux-stable-b66f0b119c96dbb6b976f1d75b7bf69960069bde.zip | |
Merge tag 'block-6.11-20240906' of git://git.kernel.dk/linux
Pull block fixes from Jens Axboe:
"Mostly just some fixlets for NVMe, but also a bug fix for the ublk
driver and an integrity fix"
* tag 'block-6.11-20240906' of git://git.kernel.dk/linux:
bio-integrity: don't restrict the size of integrity metadata
ublk_drv: fix NULL pointer dereference in ublk_ctrl_start_recovery()
nvmet: Identify-Active Namespace ID List command should reject invalid nsid
nvme: set BLK_FEAT_ZONED for ZNS multipath disks
nvme-pci: Add sleep quirk for Samsung 990 Evo
nvme-pci: allocate tagset on reset if necessary
nvmet-tcp: fix kernel crash if commands allocation fails
nvme: use better description for async reset reason
nvmet: Make nvmet_debugfs static
Diffstat (limited to 'drivers/nvme/target/tcp.c')
| -rw-r--r-- | drivers/nvme/target/tcp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c index 5bff0d5464d1..7c51c2a8c109 100644 --- a/drivers/nvme/target/tcp.c +++ b/drivers/nvme/target/tcp.c @@ -2146,8 +2146,10 @@ static u16 nvmet_tcp_install_queue(struct nvmet_sq *sq) } queue->nr_cmds = sq->size * 2; - if (nvmet_tcp_alloc_cmds(queue)) + if (nvmet_tcp_alloc_cmds(queue)) { + queue->nr_cmds = 0; return NVME_SC_INTERNAL; + } return 0; } |