io-uring.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH for-next 1/1] io_uring/net: fix non-zc send with address
@ 2022-09-29  0:03 Pavel Begunkov
  2022-09-29  1:29 ` Jens Axboe
  0 siblings, 1 reply; 2+ messages in thread
From: Pavel Begunkov @ 2022-09-29  0:03 UTC (permalink / raw)
  To: io-uring; +Cc: Jens Axboe, asml.silence

We're currently ignoring the dest address with non-zerocopy send because
even though we copy it from the userspace shortly after ->msg_name gets
zeroed. Move msghdr init earlier.

Fixes: 516e82f0e043a ("io_uring/net: support non-zerocopy sendto")
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
---
 io_uring/net.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/io_uring/net.c b/io_uring/net.c
index 6b69eff6887e..4f671e6c8f3e 100644
--- a/io_uring/net.c
+++ b/io_uring/net.c
@@ -333,6 +333,12 @@ int io_send(struct io_kiocb *req, unsigned int issue_flags)
 	int min_ret = 0;
 	int ret;
 
+	msg.msg_name = NULL;
+	msg.msg_control = NULL;
+	msg.msg_controllen = 0;
+	msg.msg_namelen = 0;
+	msg.msg_ubuf = NULL;
+
 	if (sr->addr) {
 		if (req_has_async_data(req)) {
 			struct io_async_msghdr *io = req->async_data;
@@ -359,12 +365,6 @@ int io_send(struct io_kiocb *req, unsigned int issue_flags)
 	if (unlikely(ret))
 		return ret;
 
-	msg.msg_name = NULL;
-	msg.msg_control = NULL;
-	msg.msg_controllen = 0;
-	msg.msg_namelen = 0;
-	msg.msg_ubuf = NULL;
-
 	flags = sr->msg_flags;
 	if (issue_flags & IO_URING_F_NONBLOCK)
 		flags |= MSG_DONTWAIT;
-- 
2.37.2


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH for-next 1/1] io_uring/net: fix non-zc send with address
  2022-09-29  0:03 [PATCH for-next 1/1] io_uring/net: fix non-zc send with address Pavel Begunkov
@ 2022-09-29  1:29 ` Jens Axboe
  0 siblings, 0 replies; 2+ messages in thread
From: Jens Axboe @ 2022-09-29  1:29 UTC (permalink / raw)
  To: Pavel Begunkov, io-uring

On Thu, 29 Sep 2022 01:03:29 +0100, Pavel Begunkov wrote:
> We're currently ignoring the dest address with non-zerocopy send because
> even though we copy it from the userspace shortly after ->msg_name gets
> zeroed. Move msghdr init earlier.
> 
> 

Applied, thanks!

[1/1] io_uring/net: fix non-zc send with address
      commit: 04360d3e05e885621a5860f987c6a8a2eac4bb27

Best regards,
-- 
Jens Axboe



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-09-29  1:29 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-29  0:03 [PATCH for-next 1/1] io_uring/net: fix non-zc send with address Pavel Begunkov
2022-09-29  1:29 ` Jens Axboe

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).