Commit b366bd7d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'io_uring-5.18-2022-05-06' of git://git.kernel.dk/linux-block 

Pull io_uring fix from Jens Axboe:
 "Just a single file assignment fix this week"

* tag 'io_uring-5.18-2022-05-06' of git://git.kernel.dk/linux-block:
  io_uring: assign non-fixed early for async work
parents 4b97bac0 a196c78b

fs/io_uring.c

+6 −1
Original line number Diff line number Diff line
@@ -6947,7 +6947,12 @@ static int io_req_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) 


static int io_req_prep_async(struct io_kiocb *req)

{

	if (!io_op_defs[req->opcode].needs_async_setup)

	const struct io_op_def *def = &io_op_defs[req->opcode];



	/* assign early for deferred execution for non-fixed file */

	if (def->needs_file && !(req->flags & REQ_F_FIXED_FILE))

		req->file = io_file_get_normal(req, req->fd);

	if (!def->needs_async_setup)

		return 0;

	if (WARN_ON_ONCE(req_has_async_data(req)))

		return -EFAULT;