diff options
| author | Jens Axboe <axboe@kernel.dk> | 2023-03-03 16:49:57 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-03-03 17:13:15 +0300 |
| commit | da24142b1ef9fd5d36b76e36bab328a5b27523e8 (patch) | |
| tree | b8e9ff1cb05426726229daa93186056ad90676a9 /io_uring | |
| parent | a25aa776b0c49b17c67ee047e58537552f16776f (diff) | |
| download | linux-da24142b1ef9fd5d36b76e36bab328a5b27523e8.tar.xz | |
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 <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'io_uring')
| -rw-r--r-- | io_uring/io_uring.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index 0c27b81ee1eb..cf6f8aeb450d 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -7139,7 +7139,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; } |