6.1-stable patches

added patches:
	io_uring-fix-off-by-one-bvec-index.patch

diff --git a/queue-6.1/io_uring-fix-off-by-one-bvec-index.patch b/queue-6.1/io_uring-fix-off-by-one-bvec-index.patch
new file mode 100644 (file)
index 0000000..92e7ad6
--- /dev/null
+++ b/queue-6.1/io_uring-fix-off-by-one-bvec-index.patch
@@ -0,0 +1,35 @@
+From d6fef34ee4d102be448146f24caf96d7b4a05401 Mon Sep 17 00:00:00 2001
+From: Keith Busch <kbusch@kernel.org>
+Date: Mon, 20 Nov 2023 14:18:31 -0800
+Subject: io_uring: fix off-by one bvec index
+
+From: Keith Busch <kbusch@kernel.org>
+
+commit d6fef34ee4d102be448146f24caf96d7b4a05401 upstream.
+
+If the offset equals the bv_len of the first registered bvec, then the
+request does not include any of that first bvec. Skip it so that drivers
+don't have to deal with a zero length bvec, which was observed to break
+NVMe's PRP list creation.
+
+Cc: stable@vger.kernel.org
+Fixes: bd11b3a391e3 ("io_uring: don't use iov_iter_advance() for fixed buffers")
+Signed-off-by: Keith Busch <kbusch@kernel.org>
+Link: https://lore.kernel.org/r/20231120221831.2646460-1-kbusch@meta.com
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ io_uring/rsrc.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/io_uring/rsrc.c
++++ b/io_uring/rsrc.c
+@@ -1351,7 +1351,7 @@ int io_import_fixed(int ddir, struct iov
+                */
+               const struct bio_vec *bvec = imu->bvec;
+ 
+-              if (offset <= bvec->bv_len) {
++              if (offset < bvec->bv_len) {
+                       iov_iter_advance(iter, offset);
+               } else {
+                       unsigned long seg_skip;

diff --git a/queue-6.1/series b/queue-6.1/series
index 5825a2a40eb10daec9ced26247b37e4aca2215d6..cdddea77d697a772fb726cb6271a69b31c71fdbd 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -79,3 +79,4 @@ usb-dwc3-fix-default-mode-initialization.patch
 usb-dwc3-set-the-dma-max_seg_size.patch
 usb-dwc3-qcom-fix-software-node-leak-on-probe-errors.patch
 usb-dwc3-qcom-fix-wakeup-after-probe-deferral.patch
+io_uring-fix-off-by-one-bvec-index.patch