Commit 61710e43 authored by Daniele Albano's avatar Daniele Albano Committed by Jens Axboe
Browse files

io_uring: always allow drain/link/hardlink/async sqe flags 



We currently filter these for timeout_remove/async_cancel/files_update,
but we only should be filtering for fixed file and buffer select. This
also causes a second read of sqe->flags, which isn't needed.

Just check req->flags for the relevant bits. This then allows these
commands to be used in links, for example, like everything else.

Signed-off-by: default avatarDaniele Albano <d.albano@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 807abcb0

fs/io_uring.c

+9 −4
Original line number Diff line number Diff line
@@ -4737,7 +4737,9 @@ static int io_timeout_remove_prep(struct io_kiocb *req, 
{

	if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL))

		return -EINVAL;

	if (sqe->flags || sqe->ioprio || sqe->buf_index || sqe->len)

	if (unlikely(req->flags & (REQ_F_FIXED_FILE | REQ_F_BUFFER_SELECT)))

		return -EINVAL;

	if (sqe->ioprio || sqe->buf_index || sqe->len)

		return -EINVAL;



	req->timeout.addr = READ_ONCE(sqe->addr);
@@ -4915,8 +4917,9 @@ static int io_async_cancel_prep(struct io_kiocb *req, 
{

	if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL))

		return -EINVAL;

	if (sqe->flags || sqe->ioprio || sqe->off || sqe->len ||

	    sqe->cancel_flags)

	if (unlikely(req->flags & (REQ_F_FIXED_FILE | REQ_F_BUFFER_SELECT)))

		return -EINVAL;

	if (sqe->ioprio || sqe->off || sqe->len || sqe->cancel_flags)

		return -EINVAL;



	req->cancel.addr = READ_ONCE(sqe->addr);
@@ -4934,7 +4937,9 @@ static int io_async_cancel(struct io_kiocb *req) 
static int io_files_update_prep(struct io_kiocb *req,

				const struct io_uring_sqe *sqe)

{

	if (sqe->flags || sqe->ioprio || sqe->rw_flags)

	if (unlikely(req->flags & (REQ_F_FIXED_FILE | REQ_F_BUFFER_SELECT)))

		return -EINVAL;

	if (sqe->ioprio || sqe->rw_flags)

		return -EINVAL;



	req->files_update.offset = READ_ONCE(sqe->off);

CRA Git | Maintained and supported by SUSTech CRA and CCSE