From 9bb1aafc2a1a18251c4753880cbc4f54ef302059 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 3 Mar 2023 15:02:39 +0100 Subject: [PATCH] 5.15-stable patches added patches: io_uring-ensure-that-io_init_req-passes-in-the-right.patch series --- ...that-io_init_req-passes-in-the-right.patch | 30 +++++++++++++++++++ queue-5.15/series | 1 + 2 files changed, 31 insertions(+) create mode 100644 queue-5.15/io_uring-ensure-that-io_init_req-passes-in-the-right.patch create mode 100644 queue-5.15/series diff --git a/queue-5.15/io_uring-ensure-that-io_init_req-passes-in-the-right.patch b/queue-5.15/io_uring-ensure-that-io_init_req-passes-in-the-right.patch new file mode 100644 index 00000000000..b5e4d62c344 --- /dev/null +++ b/queue-5.15/io_uring-ensure-that-io_init_req-passes-in-the-right.patch @@ -0,0 +1,30 @@ +From 8faad4b8f64aa27a54a5fbbe5c3163cc3b7dd61c Mon Sep 17 00:00:00 2001 +From: Jens Axboe +Date: Fri, 3 Mar 2023 06:49:57 -0700 +Subject: io_uring: ensure that io_init_req() passes in the right issue_flags + +From: Jens Axboe + +We can't use 0 here, as io_init_req() is always invoked with the +ctx uring_lock held. Newer kernels have IO_URING_F_UNLOCKED for this, +but previously we used IO_URING_F_NONBLOCK to indicate this as well. + +Fixes: cf7f9cd50013 ("io_uring: add missing lock in io_get_file_fixed") +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman +--- + io_uring/io_uring.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/io_uring/io_uring.c ++++ b/io_uring/io_uring.c +@@ -7310,7 +7310,8 @@ static int io_init_req(struct io_ring_ct + + if (io_op_defs[req->opcode].needs_file) { + req->file = io_file_get(ctx, req, READ_ONCE(sqe->fd), +- (sqe_flags & IOSQE_FIXED_FILE), 0); ++ (sqe_flags & IOSQE_FIXED_FILE), ++ IO_URING_F_NONBLOCK); + if (unlikely(!req->file)) + ret = -EBADF; + } diff --git a/queue-5.15/series b/queue-5.15/series new file mode 100644 index 00000000000..48fad7058ed --- /dev/null +++ b/queue-5.15/series @@ -0,0 +1 @@ +io_uring-ensure-that-io_init_req-passes-in-the-right.patch -- 2.47.3