diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-04-12 10:19:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-04-12 10:19:36 -0700 |
| commit | c7adbe2eb7639c9408599dd9762ba2fa3b87297c (patch) | |
| tree | ed25bd30de0e1e5aa579c5a0125a65d19502f3e2 /io_uring/net.c | |
| parent | 90d3eaaf4f401b334aa5d156f843df3a3e7b30a0 (diff) | |
| parent | ff81dade48608363136d52bb2493a6df76458b28 (diff) | |
Merge tag 'io_uring-6.9-20240412' of git://git.kernel.dk/linux
Pull io_uring fixes from Jens Axboe:
- Fix for sigmask restoring while waiting for events (Alexey)
- Typo fix in comment (Haiyue)
- Fix for a msg_control retstore on SEND_ZC retries (Pavel)
* tag 'io_uring-6.9-20240412' of git://git.kernel.dk/linux:
io-uring: correct typo in comment for IOU_F_TWQ_LAZY_WAKE
io_uring/net: restore msg_control on sendzc retry
io_uring: Fix io_cqring_wait() not restoring sigmask on get_timespec64() failure
Diffstat (limited to 'io_uring/net.c')
| -rw-r--r-- | io_uring/net.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/io_uring/net.c b/io_uring/net.c index 1e7665ff6ef7..4afb475d4197 100644 --- a/io_uring/net.c +++ b/io_uring/net.c @@ -1276,6 +1276,7 @@ int io_sendmsg_zc(struct io_kiocb *req, unsigned int issue_flags) if (req_has_async_data(req)) { kmsg = req->async_data; + kmsg->msg.msg_control_user = sr->msg_control; } else { ret = io_sendmsg_copy_hdr(req, &iomsg); if (ret) |