| Message ID | 176ced5e8568aa5d300ca899b7f05b303ebc49fd.1664409532.git.asml.silence@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [for-next,1/1] io_uring/net: fix non-zc send with address | expand |
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,
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;
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(-)