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

BugLink: https://bugs.launchpad.net/bugs/1856583
commit 441cdbd5449b4923cd413d3ba748124f91388be9 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/fs/io_uring.c b/fs/io_uring.c
index aa05a032fabc7714748e98ea13ee0a375d58a050..aeb3d7aa1489d27a6a301bef635bf7eed1a86380 100644 (file)
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -1667,6 +1667,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->ctx, sqe->user_data, ret);