diff options
| author | Jiri Kosina <jkosina@suse.com> | 2025-03-26 13:50:46 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.com> | 2025-03-26 13:50:46 +0100 |
| commit | 770493524e9f623826765eb97c64d699f4752e4f (patch) | |
| tree | 304c718009aa32834511d45497adb8acba496088 /io_uring/net.c | |
| parent | e4f7cc8c36e7cab391683db682402ab2f185bf92 (diff) | |
| parent | fe0fb58325e519008e2606a5aa2cff7ad23e212d (diff) | |
Merge branch 'for-6.15/intel-ish' into for-linus
- intel-ish Kbuild cleanup (Jiri Kosina)
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 17852a6616ff..5d0b56ff50ee 100644 --- a/io_uring/net.c +++ b/io_uring/net.c @@ -322,7 +322,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 |