From a041bf5a9265e7f3120a481869d20aba9d593528 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 12 Aug 2023 18:28:58 +0200 Subject: [PATCH] 6.1-stable patches added patches: io_uring-correct-check-for-o_tmpfile.patch --- ...io_uring-correct-check-for-o_tmpfile.patch | 39 +++++++++++++++++++ queue-6.1/series | 1 + 2 files changed, 40 insertions(+) create mode 100644 queue-6.1/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 index 00000000000..33e0e181b6c --- /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 +Date: Sat, 12 Aug 2023 07:16:11 -0600 +Subject: io_uring: correct check for O_TMPFILE + +From: Aleksa Sarai + +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 +Link: https://lore.kernel.org/r/20230807-resolve_cached-o_tmpfile-v3-1-e49323e1ef6f@cyphar.com +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman +--- + 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 e977bef4e28..69c124dc063 100644 --- 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 -- 2.47.3