From: Greg Kroah-Hartman Date: Thu, 30 Nov 2023 15:05:29 +0000 (+0000) Subject: 5.15-stable patches X-Git-Tag: v5.15.141~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1664d6aea7012f0bf09aa4cede5b1983f4963239;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: io_uring-fix-off-by-one-bvec-index.patch --- diff --git a/queue-5.15/io_uring-fix-off-by-one-bvec-index.patch b/queue-5.15/io_uring-fix-off-by-one-bvec-index.patch new file mode 100644 index 00000000000..23e6b52b245 --- /dev/null +++ b/queue-5.15/io_uring-fix-off-by-one-bvec-index.patch @@ -0,0 +1,35 @@ +From 4581de67b1393426ac29d8c6d19119e15f08a313 Mon Sep 17 00:00:00 2001 +From: Keith Busch +Date: Mon, 20 Nov 2023 14:18:31 -0800 +Subject: io_uring: fix off-by one bvec index + +From: Keith Busch + +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 +Link: https://lore.kernel.org/r/20231120221831.2646460-1-kbusch@meta.com +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman +--- + io_uring/io_uring.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/io_uring/io_uring.c ++++ b/io_uring/io_uring.c +@@ -3152,7 +3152,7 @@ static int __io_import_fixed(struct io_k + */ + 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-5.15/series b/queue-5.15/series index 3a3e68f083b..57db4a2cf16 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -66,3 +66,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