diff options
| author | Jens Axboe <axboe@kernel.dk> | 2023-05-17 20:15:00 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-05-17 20:15:00 +0200 |
| commit | bf34e697931f64b21c82232e98b3d1f566214e40 (patch) | |
| tree | dce9eeb2f9402b668f9da7b565753f5ded0d47cf /io_uring/net.c | |
| parent | io_uring: Add io_uring_setup flag to pre-register ring fd and never install it (diff) | |
| download | linux-bf34e697931f64b21c82232e98b3d1f566214e40.tar.xz linux-bf34e697931f64b21c82232e98b3d1f566214e40.zip | |
io_uring/net: initialize struct msghdr more sanely for io_recv()
We only need to clear the input fields on the first invocation, not
when potentially doing a retry.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'io_uring/net.c')
| -rw-r--r-- | io_uring/net.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/io_uring/net.c b/io_uring/net.c index 89e839013837..08fe42673b75 100644 --- a/io_uring/net.c +++ b/io_uring/net.c @@ -860,6 +860,14 @@ int io_recv(struct io_kiocb *req, unsigned int issue_flags) if (unlikely(!sock)) return -ENOTSOCK; + msg.msg_name = NULL; + msg.msg_namelen = 0; + msg.msg_control = NULL; + msg.msg_get_inq = 1; + msg.msg_controllen = 0; + msg.msg_iocb = NULL; + msg.msg_ubuf = NULL; + retry_multishot: if (io_do_buffer_select(req)) { void __user *buf; @@ -874,14 +882,7 @@ retry_multishot: if (unlikely(ret)) goto out_free; - msg.msg_name = NULL; - msg.msg_namelen = 0; - msg.msg_control = NULL; - msg.msg_get_inq = 1; msg.msg_flags = 0; - msg.msg_controllen = 0; - msg.msg_iocb = NULL; - msg.msg_ubuf = NULL; flags = sr->msg_flags; if (force_nonblock) |