Commit 6ca56f84 authored by Jens Axboe's avatar Jens Axboe
Browse files

io_uring: mark statx/files_update/epoll_ctl as non-SQPOLL 



These will naturally fail when attempted through SQPOLL, but either
with -EFAULT or -EBADF. Make it explicit that these are not workable
through SQPOLL and return -EINVAL, just like other ops that need to
use ->files.

Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 72f04da4

fs/io_uring.c

+4 −2
Original line number Diff line number Diff line
@@ -3786,7 +3786,7 @@ static int io_epoll_ctl_prep(struct io_kiocb *req, 
#if defined(CONFIG_EPOLL)

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

		return -EINVAL;

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

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

		return -EINVAL;



	req->epoll.epfd = READ_ONCE(sqe->fd);
@@ -3901,7 +3901,7 @@ static int io_fadvise(struct io_kiocb *req, bool force_nonblock) 


static int io_statx_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)

{

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

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

		return -EINVAL;

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

		return -EINVAL;
@@ -5418,6 +5418,8 @@ 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 (unlikely(req->ctx->flags & IORING_SETUP_SQPOLL))

		return -EINVAL;

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

		return -EINVAL;

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