redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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

commit 441cdbd544 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>
5.4-rM2-2.2.x-imx-squashed
Jens Axboe 2019-12-02 18:49:10 -07:00 committed by Greg Kroah-Hartman
parent f246eedbaf
commit 57aabff8cc
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/io_uring.c
View File

@ -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);