Commit adf3a9e9 authored by Jens Axboe's avatar Jens Axboe
Browse files

io_uring: don't check unrelated req->open.how in accept request 



Looks like a victim of too much copy/paste, we should not be looking
at req->open.how in accept. The point is to check CLOEXEC and error
out, which we don't invalid direct descriptors on exec. Hence any
attempt to get a direct descriptor with CLOEXEC is invalid.

No harm is done here, as req->open.how.flags overlaps with
req->accept.flags, but it's very confusing and might change if either of
those command structs are modified.

Fixes: aaa4db12 ("io_uring: accept directly into fixed file table")
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent dbc7d452

fs/io_uring.c

+1 −2
Original line number Diff line number Diff line
@@ -5535,8 +5535,7 @@ static int io_accept_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) 
	accept->nofile = rlimit(RLIMIT_NOFILE);



	accept->file_slot = READ_ONCE(sqe->file_index);

	if (accept->file_slot && ((req->open.how.flags & O_CLOEXEC) ||

				  (accept->flags & SOCK_CLOEXEC)))

	if (accept->file_slot && (accept->flags & SOCK_CLOEXEC))

		return -EINVAL;

	if (accept->flags & ~(SOCK_CLOEXEC | SOCK_NONBLOCK))

		return -EINVAL;