mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 06:33:07 +00:00
io_uring/net: don't update msg_name if not provided
commit 6f10ae8a15
upstream.
io_sendmsg_copy_hdr() may clear msg->msg_name if the userspace didn't
provide it, we should retain NULL in this case.
Cc: stable@vger.kernel.org
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/97d49f61b5ec76d0900df658cfde3aa59ff22121.1664486545.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
a1bd289c10
commit
f9dc33f231
1 changed files with 2 additions and 1 deletions
|
@ -4762,7 +4762,8 @@ static int io_setup_async_msg(struct io_kiocb *req,
|
||||||
async_msg = req->async_data;
|
async_msg = req->async_data;
|
||||||
req->flags |= REQ_F_NEED_CLEANUP;
|
req->flags |= REQ_F_NEED_CLEANUP;
|
||||||
memcpy(async_msg, kmsg, sizeof(*kmsg));
|
memcpy(async_msg, kmsg, sizeof(*kmsg));
|
||||||
async_msg->msg.msg_name = &async_msg->addr;
|
if (async_msg->msg.msg_name)
|
||||||
|
async_msg->msg.msg_name = &async_msg->addr;
|
||||||
/* if were using fast_iov, set it to the new one */
|
/* if were using fast_iov, set it to the new one */
|
||||||
if (!async_msg->free_iov)
|
if (!async_msg->free_iov)
|
||||||
async_msg->msg.msg_iter.iov = async_msg->fast_iov;
|
async_msg->msg.msg_iter.iov = async_msg->fast_iov;
|
||||||
|
|
Loading…
Reference in a new issue