Commit 8e3cca12 authored by Jens Axboe's avatar Jens Axboe
Browse files

io_uring: convert accept4() -ERESTARTSYS into -EINTR 



If we cancel a pending accept operating with a signal, we get
-ERESTARTSYS returned. Turn that into -EINTR for userspace, we should
not be return -ERESTARTSYS.

Fixes: 17f2fe35 ("io_uring: add support for IORING_OP_ACCEPT")
Reported-by: default avatarHrvoje Zeba <zeba.hrvoje@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 46568e9b

fs/io_uring.c

+2 −0
Original line number Diff line number Diff line
@@ -1887,6 +1887,8 @@ static int io_accept(struct io_kiocb *req, const struct io_uring_sqe *sqe, 
		req->work.flags |= IO_WQ_WORK_NEEDS_FILES;

		return -EAGAIN;

	}

	if (ret == -ERESTARTSYS)

		ret = -EINTR;

	if (ret < 0 && (req->flags & REQ_F_LINK))

		req->flags |= REQ_F_FAIL_LINK;

	io_cqring_add_event(req, ret);