summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Begunkov <asml.silence@gmail.com>2025-02-25 15:59:02 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-03-07 18:25:35 +0100
commit546c19eb69fdee26cf3734cf587758f6dbfcf8b3 (patch)
treea86259bdd23b9865b11712d0323fb8e54742011e
parent27a144c3be8cb7b1e6d09ae63deb9e4a241aedfe (diff)
downloadlinux-546c19eb69fdee26cf3734cf587758f6dbfcf8b3.tar.gz
linux-546c19eb69fdee26cf3734cf587758f6dbfcf8b3.tar.bz2
linux-546c19eb69fdee26cf3734cf587758f6dbfcf8b3.zip
io_uring/net: save msg_control for compat
[ Upstream commit 6ebf05189dfc6d0d597c99a6448a4d1064439a18 ] Match the compat part of io_sendmsg_copy_hdr() with its counterpart and save msg_control. Fixes: c55978024d123 ("io_uring/net: move receive multishot out of the generic msghdr path") Signed-off-by: Pavel Begunkov <asml.silence@gmail.com> Link: https://lore.kernel.org/r/2a8418821fe83d3b64350ad2b3c0303e9b732bbd.1740498502.git.asml.silence@gmail.com Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--io_uring/net.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/io_uring/net.c b/io_uring/net.c
index 3974c417fe26..f32311f64113 100644
--- a/io_uring/net.c
+++ b/io_uring/net.c
@@ -334,7 +334,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