diff options
| author | Jens Axboe <axboe@kernel.dk> | 2025-02-27 07:18:01 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2025-02-27 07:18:01 -0700 |
| commit | c0d8c0362ba56dd68b45293271e5829ed8c95f5a (patch) | |
| tree | a0ba4791921a273cc9d360b71845bbe71f3e0a7c /io_uring/net.c | |
| parent | 5d309914773370308eb98d1db664eb18f502c5a6 (diff) | |
| parent | 6ebf05189dfc6d0d597c99a6448a4d1064439a18 (diff) | |
Merge branch 'io_uring-6.14' into for-6.15/io_uring
Merge mainline fixes into 6.15 branch, as upcoming patches depend on
fixes that went into the 6.14 mainline branch.
* io_uring-6.14:
io_uring/net: save msg_control for compat
io_uring/rw: clean up mshot forced sync mode
io_uring/rw: move ki_complete init into prep
io_uring/rw: don't directly use ki_complete
io_uring/rw: forbid multishot async reads
io_uring/rsrc: remove unused constants
io_uring: fix spelling error in uapi io_uring.h
io_uring: prevent opcode speculation
io-wq: backoff when retrying worker creation
Diffstat (limited to 'io_uring/net.c')
| -rw-r--r-- | io_uring/net.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/io_uring/net.c b/io_uring/net.c index 3d93af98967a..bce75d64be92 100644 --- a/io_uring/net.c +++ b/io_uring/net.c @@ -323,7 +323,9 @@ static int io_sendmsg_copy_hdr(struct io_kiocb *req, if (unlikely(ret)) return ret; - return __get_compat_msghdr(&iomsg->msg, &cmsg, NULL); + ret = __get_compat_msghdr(&iomsg->msg, &cmsg, NULL); + sr->msg_control = iomsg->msg.msg_control_user; + return ret; } #endif |