io_uring: retain sockaddr_storage across send/recvmsg async punt
Jens Axboe
maintainerPATCH 1/1 io_uring: retain sockaddr_storage across send/recvmsg async punt
Jonas reports that he sometimes sees -97/-22 error returns from sendmsg, if it gets punted async. This is due to not retaining the sockaddr_storage between calls. Include that in the state we copy when going async.
Cc [email protected] # 5.3+
Reported-by Jonas Bonn <[email protected]>
Tested-by Jonas Bonn <[email protected]>
Signed-off-by Jens Axboe <[email protected]>
--- fs/io_uring.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
fs/io_uring.c +5 -6
@@ -442,6 +442,7 @@ struct io_async_msghdr {struct iovec *iov;struct sockaddr __user *uaddr;struct msghdr msg; +struct sockaddr_storage addr; };struct io_async_rw {
@@ -3031,12 +3032,11 @@ static int io_sendmsg(struct io_kiocb *req, struct io_kiocb **nxt, sock =sock_from_file (req->file, &ret);if (sock) {struct io_async_ctx io; -struct sockaddr_storage addr;unsigned flags;if (req->io) { kmsg = &req->io->msg; - kmsg->msg.msg_name = &addr; + kmsg->msg.msg_name = &req->io->msg.addr;/* if iov is set, it's allocated already */ if (!kmsg->iov) kmsg->iov = kmsg->fast_iov;
@@ -3045,7 +3045,7 @@ static int io_sendmsg(struct io_kiocb *req, struct io_kiocb **nxt,struct io_sr_msg *sr = &req->sr_msg; kmsg = &io.msg; - kmsg->msg.msg_name = &addr; + kmsg->msg.msg_name = &io.msg.addr; io.msg.iov = io.msg.fast_iov; ret = sendmsg_copy_msghdr(&io.msg.msg, sr->msg,
@@ -3184,12 +3184,11 @@ static int io_recvmsg(struct io_kiocb *req, struct io_kiocb **nxt, sock =sock_from_file (req->file, &ret);if (sock) {struct io_async_ctx io; -struct sockaddr_storage addr;unsigned flags;if (req->io) { kmsg = &req->io->msg; - kmsg->msg.msg_name = &addr; + kmsg->msg.msg_name = &req->io->msg.addr;/* if iov is set, it's allocated already */ if (!kmsg->iov) kmsg->iov = kmsg->fast_iov;
@@ -3198,7 +3197,7 @@ static int io_recvmsg(struct io_kiocb *req, struct io_kiocb **nxt,struct io_sr_msg *sr = &req->sr_msg; kmsg = &io.msg; - kmsg->msg.msg_name = &addr; + kmsg->msg.msg_name = &io.msg.addr; io.msg.iov = io.msg.fast_iov; ret = recvmsg_copy_msghdr(&io.msg.msg, sr->msg,
Signature · 4 lines
2.25.0 -- Jens Axboe