6.1-stable patches

added patches:
	io_uring-correct-check-for-o_tmpfile.patch

diff --git a/queue-6.1/io_uring-correct-check-for-o_tmpfile.patch b/queue-6.1/io_uring-correct-check-for-o_tmpfile.patch
new file mode 100644 (file)
index 0000000..33e0e18
--- /dev/null
+++ b/queue-6.1/io_uring-correct-check-for-o_tmpfile.patch
@@ -0,0 +1,39 @@
+From b79496e153eb020f95151976284426b050a79e97 Mon Sep 17 00:00:00 2001
+From: Aleksa Sarai <cyphar@cyphar.com>
+Date: Sat, 12 Aug 2023 07:16:11 -0600
+Subject: io_uring: correct check for O_TMPFILE
+
+From: Aleksa Sarai <cyphar@cyphar.com>
+
+Commit 72dbde0f2afbe4af8e8595a89c650ae6b9d9c36f upstream.
+
+O_TMPFILE is actually __O_TMPFILE|O_DIRECTORY. This means that the old
+check for whether RESOLVE_CACHED can be used would incorrectly think
+that O_DIRECTORY could not be used with RESOLVE_CACHED.
+
+Cc: stable@vger.kernel.org # v5.12+
+Fixes: 3a81fd02045c ("io_uring: enable LOOKUP_CACHED path resolution for filename lookups")
+Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
+Link: https://lore.kernel.org/r/20230807-resolve_cached-o_tmpfile-v3-1-e49323e1ef6f@cyphar.com
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ io_uring/openclose.c |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/io_uring/openclose.c
++++ b/io_uring/openclose.c
+@@ -110,9 +110,11 @@ int io_openat2(struct io_kiocb *req, uns
+       if (issue_flags & IO_URING_F_NONBLOCK) {
+               /*
+                * Don't bother trying for O_TRUNC, O_CREAT, or O_TMPFILE open,
+-               * it'll always -EAGAIN
++               * it'll always -EAGAIN. Note that we test for __O_TMPFILE
++               * because O_TMPFILE includes O_DIRECTORY, which isn't a flag
++               * we need to force async for.
+                */
+-              if (open->how.flags & (O_TRUNC | O_CREAT | O_TMPFILE))
++              if (open->how.flags & (O_TRUNC | O_CREAT | __O_TMPFILE))
+                       return -EAGAIN;
+               op.lookup_flags |= LOOKUP_CACHED;
+               op.open_flag |= O_NONBLOCK;

diff --git a/queue-6.1/series b/queue-6.1/series
index e977bef4e28209f777d8dcfb11f2ff97d5c3a61e..69c124dc063b468b01319fdc1c870660d2539d11 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -48,3 +48,4 @@ drm-amd-display-disable-phantom-otg-after-enable-for-plane-disable.patch
 drm-amd-display-retain-phantom-plane-stream-if-validation-fails.patch
 drm-amd-display-fix-the-build-when-drm_amd_dc_dcn-is-not-set.patch
 drm-amd-display-trigger-timing-sync-only-if-tg-is-running.patch
+io_uring-correct-check-for-o_tmpfile.patch