]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
nvme/ioctl: don't warn on vectorized uring_cmd with fixed buffer
authorCaleb Sander Mateos <csander@purestorage.com>
Fri, 28 Mar 2025 15:46:45 +0000 (09:46 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 Apr 2025 12:39:33 +0000 (14:39 +0200)
[ Upstream commit eada75467fca0b016b9b22212637c07216135c20 ]

The vectorized io_uring NVMe passthru opcodes don't yet support fixed
buffers. But since userspace can trigger this condition based on the
io_uring SQE parameters, it shouldn't cause a kernel warning.

Signed-off-by: Caleb Sander Mateos <csander@purestorage.com>
Reviewed-by: Jens Axboe <axboe@kernel.dk>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Fixes: 23fd22e55b76 ("nvme: wire up fixed buffer support for nvme passthrough")
Signed-off-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/nvme/host/ioctl.c

index e4daac9c2440152afa3a6d66f7d20a97c408c426..a1b3c538a4bd2e2132a459a0e281d221c28e5b63 100644 (file)
@@ -141,7 +141,7 @@ static int nvme_map_user_request(struct request *req, u64 ubuffer,
                struct iov_iter iter;
 
                /* fixedbufs is only for non-vectored io */
-               if (WARN_ON_ONCE(flags & NVME_IOCTL_VEC)) {
+               if (flags & NVME_IOCTL_VEC) {
                        ret = -EINVAL;
                        goto out;
                }