From: Greg Kroah-Hartman Date: Sat, 12 Aug 2023 16:28:48 +0000 (+0200) Subject: 5.15-stable patches X-Git-Tag: v4.14.323~57 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59b6853083498e5d9d9b11718d3689bb9151ff31;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: io_uring-correct-check-for-o_tmpfile.patch --- diff --git a/queue-5.15/io_uring-correct-check-for-o_tmpfile.patch b/queue-5.15/io_uring-correct-check-for-o_tmpfile.patch new file mode 100644 index 00000000000..f68804913bc --- /dev/null +++ b/queue-5.15/io_uring-correct-check-for-o_tmpfile.patch @@ -0,0 +1,39 @@ +From 4058ff53fe1a831dc82bcc51f5a6424e8b28d159 Mon Sep 17 00:00:00 2001 +From: Aleksa Sarai +Date: Sat, 12 Aug 2023 07:19:05 -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/io_uring.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/io_uring/io_uring.c ++++ b/io_uring/io_uring.c +@@ -4375,9 +4375,11 @@ static int io_openat2(struct io_kiocb *r + 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 (req->open.how.flags & (O_TRUNC | O_CREAT | O_TMPFILE)) ++ if (req->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-5.15/series b/queue-5.15/series index c18b464362e..6d53161c34e 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -17,3 +17,4 @@ bpf-aggressively-forget-precise-markings-during-state-checkpointing.patch selftests-bpf-make-test_align-selftest-more-robust.patch selftests-bpf-workaround-verification-failure-for-fexit_bpf2bpf-func_replace_return_code.patch selftests-bpf-fix-sk_assign-on-s390x.patch +io_uring-correct-check-for-o_tmpfile.patch