diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-02-28 09:11:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-02-28 09:11:15 -0800 |
| commit | 3e5d15dd83e110da062d825be985529aa1d44029 (patch) | |
| tree | 99f4475038fadb85090ddb8a585f3a1866f304bc /io_uring | |
| parent | ea185bdedb738b9ace114dd6806e95ccd53c6c52 (diff) | |
| parent | 6ebf05189dfc6d0d597c99a6448a4d1064439a18 (diff) | |
Merge tag 'io_uring-6.14-20250228' of git://git.kernel.dk/linux
Pull io_uring fix from Jens Axboe:
"Just a single fix headed for stable, ensuring that msg_control is
properly saved in compat mode as well"
* tag 'io_uring-6.14-20250228' of git://git.kernel.dk/linux:
io_uring/net: save msg_control for compat
Diffstat (limited to 'io_uring')
| -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 |