From: Jens Axboe <axboe@kernel.dk>
Date: Sun, 10 Nov 2019 02:52:33 +0000 (-0700)
Subject: io_uring: convert accept4() -ERESTARTSYS into -EINTR
X-Git-Tag: v5.5-rc1~204^2~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8e3cca12706231daf8daf90dbde59f1665135e48;p=thirdparty%2Flinux.git

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: 17f2fe35d080 ("io_uring: add support for IORING_OP_ACCEPT")
Reported-by: Hrvoje Zeba <zeba.hrvoje@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 737c311c6da53..bbb3889dae41b 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -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);