summaryrefslogtreecommitdiff
path: root/io_uring
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 16:45:43 +0100
commit685da33c81d0e2cda168f0532cc04a0683f3c939 (patch)
tree31f20f5655ff94eb8ea9a0bbbdff17ea3d8a145a /io_uring
parent0b6f19714588cf2366b0364234f97ba963688f63 (diff)
downloadlinux-685da33c81d0e2cda168f0532cc04a0683f3c939.tar.gz
linux-685da33c81d0e2cda168f0532cc04a0683f3c939.tar.bz2
linux-685da33c81d0e2cda168f0532cc04a0683f3c939.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>
Diffstat (limited to 'io_uring')
-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 56091292950f..1a0e98e19dc0 100644
--- a/io_uring/net.c
+++ b/io_uring/net.c
@@ -303,7 +303,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