io_uring/net: clear msg_controllen on partial sendmsg retry
Jens Axboe
maintainerPATCH v2 1/1 io_uring/net: clear msg_controllen on partial sendmsg retry
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 [email protected] # 5.10+
Fixes cac9e4418f4c ("io_uring/net: save msghdr->msg_control for retries")
Reported-by Stefan Metzmacher <[email protected]>
Signed-off-by Jens Axboe <[email protected]>
---
v2: clear msg_control as well
io_uring/net.c | 2 ++ 1 file changed, 2 insertions(+)
io_uring/net.c +2 -0
@@ -326,6 +326,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);
Signature · 4 lines
2.39.2 -- Jens Axboe
Am 20.06.23 um 15:19 schrieb Jens Axboe:
Quoted 7 lines
If we have cmsg attached AND we transferred partial data at least, clear
msg_controllenon retry so we don't attempt to send that again.Cc [email protected] # 5.10+Fixes cac9e4418f4c ("io_uring/net: save msghdr->msg_control for retries")Reported-by Stefan Metzmacher <[email protected]>Signed-off-by Jens Axboe <[email protected]>
Also Reviewed-by: Stefan Metzmacher <[email protected]>
Quoted 20 lines
---
v2: clear
msg_controlas wellio_uring/net.c | 2 ++ 1 file changed, 2 insertions(+)io_uring/net.c +2
-0@@ -326,6 +326,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);