summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorPavel Begunkov <asml.silence@gmail.com>2020-07-12 13:23:08 +0300
committerJens Axboe <axboe@kernel.dk>2020-07-12 09:40:25 -0600
commitdd821e0c95a64b5923a0c57f07d3f7563553e756 (patch)
tree48c319b0faa1f955be0e72caf91d8c3c19ec2f03 /fs
parent309fc03a3284af62eb6082fb60327045a1dabf57 (diff)
downloadlinux-stable-dd821e0c95a64b5923a0c57f07d3f7563553e756.tar.gz
linux-stable-dd821e0c95a64b5923a0c57f07d3f7563553e756.tar.bz2
linux-stable-dd821e0c95a64b5923a0c57f07d3f7563553e756.zip
io_uring: fix missing msg_name assignment
Ensure to set msg.msg_name for the async portion of send/recvmsg, as the header copy will copy to/from it. Cc: stable@vger.kernel.org # v5.5+ Signed-off-by: Pavel Begunkov <asml.silence@gmail.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs')
-rw-r--r--fs/io_uring.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c
index ca8abde48b6c..5570d6aeaff8 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -3553,6 +3553,7 @@ static int io_sendmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
if (req->flags & REQ_F_NEED_CLEANUP)
return 0;
+ io->msg.msg.msg_name = &io->msg.addr;
io->msg.iov = io->msg.fast_iov;
ret = sendmsg_copy_msghdr(&io->msg.msg, sr->msg, sr->msg_flags,
&io->msg.iov);
@@ -3734,6 +3735,7 @@ static int __io_compat_recvmsg_copy_hdr(struct io_kiocb *req,
static int io_recvmsg_copy_hdr(struct io_kiocb *req, struct io_async_ctx *io)
{
+ io->msg.msg.msg_name = &io->msg.addr;
io->msg.iov = io->msg.fast_iov;
#ifdef CONFIG_COMPAT