diff options
| author | Jens Axboe <axboe@kernel.dk> | 2023-06-19 09:35:34 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-06-28 11:12:24 +0200 |
| commit | 4d729cc67b05b873055668c1868578f74ce17703 (patch) | |
| tree | 570aedd5135196817588e1ed62f11b199143bdce /io_uring | |
| parent | 4db49d59a89ce485fd247dff044686bba2a683b8 (diff) | |
| download | linux-stable-4d729cc67b05b873055668c1868578f74ce17703.tar.gz linux-stable-4d729cc67b05b873055668c1868578f74ce17703.tar.bz2 linux-stable-4d729cc67b05b873055668c1868578f74ce17703.zip | |
io_uring/net: clear msg_controllen on partial sendmsg retry
commit b1dc492087db0f2e5a45f1072a743d04618dd6be upstream.
If we have cmsg attached AND we transferred partial data at least, clear
msg_controllen on retry so we don't attempt to send that again.
Cc: stable@vger.kernel.org # 5.10+
Fixes: cac9e4418f4c ("io_uring/net: save msghdr->msg_control for retries")
Reported-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'io_uring')
| -rw-r--r-- | io_uring/net.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/io_uring/net.c b/io_uring/net.c index 05792a689994..8ead497b112c 100644 --- a/io_uring/net.c +++ b/io_uring/net.c @@ -313,6 +313,8 @@ int io_sendmsg(struct io_kiocb *req, unsigned int issue_flags) if (ret == -EAGAIN && (issue_flags & IO_URING_F_NONBLOCK)) return io_setup_async_msg(req, kmsg, issue_flags); if (ret > 0 && io_net_retry(sock, flags)) { + kmsg->msg.msg_controllen = 0; + kmsg->msg.msg_control = NULL; sr->done_io += ret; req->flags |= REQ_F_PARTIAL_IO; return io_setup_async_msg(req, kmsg, issue_flags); |