diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2022-09-29 01:03:29 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-09-28 19:29:12 -0600 |
| commit | 04360d3e05e885621a5860f987c6a8a2eac4bb27 (patch) | |
| tree | d3002690e582aa2da547d73e18bd6f1305064502 /io_uring/net.c | |
| parent | 6ae91ac9a6aa7d6005c3c6d0f4d263fbab9f377f (diff) | |
| download | lwn-04360d3e05e885621a5860f987c6a8a2eac4bb27.tar.gz lwn-04360d3e05e885621a5860f987c6a8a2eac4bb27.zip | |
io_uring/net: fix non-zc send with address
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>
Link: https://lore.kernel.org/r/176ced5e8568aa5d300ca899b7f05b303ebc49fd.1664409532.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'io_uring/net.c')
| -rw-r--r-- | io_uring/net.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/io_uring/net.c b/io_uring/net.c index 5058a9fc9e9c..23922365f08f 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; |