This is a note to let you know that I've just added the patch titled
io_uring/net: don't update msg_name if not provided
to the 5.19-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
io_uring-net-don-t-update-msg_name-if-not-provided.patch
and it can be found in the queue-5.19 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 6f10ae8a155446248055c7ddd480ef40139af788 Mon Sep 17 00:00:00 2001
From: Pavel Begunkov <asml.silence@xxxxxxxxx>
Date: Thu, 29 Sep 2022 22:23:18 +0100
Subject: io_uring/net: don't update msg_name if not provided
From: Pavel Begunkov <asml.silence@xxxxxxxxx>
commit 6f10ae8a155446248055c7ddd480ef40139af788 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@xxxxxxxxxxxxxxx
Signed-off-by: Pavel Begunkov <asml.silence@xxxxxxxxx>
Link: https://lore.kernel.org/r/97d49f61b5ec76d0900df658cfde3aa59ff22121.1664486545.git.asml.silence@xxxxxxxxx
Signed-off-by: Jens Axboe <axboe@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
io_uring/io_uring.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -5850,7 +5850,8 @@ static int io_setup_async_msg(struct io_
async_msg = req->async_data;
req->flags |= REQ_F_NEED_CLEANUP;
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 (!kmsg->free_iov) {
size_t fast_idx = kmsg->msg.msg_iter.iov - kmsg->fast_iov;
Patches currently in stable-queue which might be from asml.silence@xxxxxxxxx are
queue-5.19/io_uring-correct-pinned_vm-accounting.patch
queue-5.19/io_uring-net-don-t-update-msg_name-if-not-provided.patch
queue-5.19/io_uring-rw-fix-unexpected-link-breakage.patch
queue-5.19/io_uring-net-fix-fast_iov-assignment-in-io_setup_async_msg.patch
queue-5.19/io_uring-af_unix-defer-registered-files-gc-to-io_uring-release.patch
