UPSTREAM: io_uring: ensure that io_init_req() passes in the right issue_flags
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: 08681391b84d ("io_uring: add missing lock in io_get_file_fixed")
Signed-off-by: Jens Axboe <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
(cherry picked from commit da24142b1ef9fd5d36b76e36bab328a5b27523e8)
Bug: 268174392
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Change-Id: I762eacf1b49ca8a38d8b77c44db4ca2bc49b2c4c
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 87e1256..43ccd6ca 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -7149,7 +7149,8 @@ static int io_init_req(struct io_ring_ctx *ctx, struct io_kiocb *req,
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;
}
