From: Jens Axboe <axboe@kernel.dk>
Date: Tue, 3 Dec 2019 01:49:10 +0000 (-0700)
Subject: io_uring: transform send/recvmsg() -ERESTARTSYS to -EINTR
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=441cdbd5449b4923cd413d3ba748124f91388be9;p=uclinux-h8%2Flinux.git

io_uring: transform send/recvmsg() -ERESTARTSYS to -EINTR

We should never return -ERESTARTSYS to userspace, transform it into
-EINTR.

Cc: stable@vger.kernel.org # v5.3+
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 5cab7a047317..a91743e1fa2c 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -1917,6 +1917,8 @@ static int io_send_recvmsg(struct io_kiocb *req, const struct io_uring_sqe *sqe,
 		ret = fn(sock, msg, flags);
 		if (force_nonblock && ret == -EAGAIN)
 			return ret;
+		if (ret == -ERESTARTSYS)
+			ret = -EINTR;
 	}
 
 	io_cqring_add_event(req, ret);