From 1d08942ca24fa6e9f3bc8f16bfda035f9e8e9e29 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 22 Apr 2025 08:40:09 +0200 Subject: [PATCH] 6.6-stable patches added patches: io_uring-net-fix-accept-multishot-handling.patch --- ...ng-net-fix-accept-multishot-handling.patch | 36 +++++++++++++++++++ queue-6.6/series | 1 + 2 files changed, 37 insertions(+) create mode 100644 queue-6.6/io_uring-net-fix-accept-multishot-handling.patch diff --git a/queue-6.6/io_uring-net-fix-accept-multishot-handling.patch b/queue-6.6/io_uring-net-fix-accept-multishot-handling.patch new file mode 100644 index 0000000000..795dc448cf --- /dev/null +++ b/queue-6.6/io_uring-net-fix-accept-multishot-handling.patch @@ -0,0 +1,36 @@ +From 6a69d144661781a1e60228e26bb26985ca66723a Mon Sep 17 00:00:00 2001 +From: Pavel Begunkov +Date: Sun, 23 Feb 2025 17:22:29 +0000 +Subject: io_uring/net: fix accept multishot handling + +From: Pavel Begunkov + +Commit f6a89bf5278d6e15016a736db67043560d1b50d5 upstream. + +REQ_F_APOLL_MULTISHOT doesn't guarantee it's executed from the multishot +context, so a multishot accept may get executed inline, fail +io_req_post_cqe(), and ask the core code to kill the request with +-ECANCELED by returning IOU_STOP_MULTISHOT even when a socket has been +accepted and installed. + +Cc: stable@vger.kernel.org +Fixes: 390ed29b5e425 ("io_uring: add IORING_ACCEPT_MULTISHOT for accept") +Signed-off-by: Pavel Begunkov +Link: https://lore.kernel.org/r/51c6deb01feaa78b08565ca8f24843c017f5bc80.1740331076.git.asml.silence@gmail.com +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman +--- + io_uring/net.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/io_uring/net.c ++++ b/io_uring/net.c +@@ -1438,6 +1438,8 @@ retry: + goto retry; + + io_req_set_res(req, ret, 0); ++ if (!(issue_flags & IO_URING_F_MULTISHOT)) ++ return IOU_OK; + return IOU_STOP_MULTISHOT; + } + diff --git a/queue-6.6/series b/queue-6.6/series index 82611b1d70..4893f6acac 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -356,3 +356,4 @@ drm-amdgpu-dma_buf-fix-page_link-check.patch drm-nouveau-prime-fix-ttm_bo_delayed_delete-oops.patch drm-sti-remove-duplicate-object-names.patch drm-i915-gvt-fix-unterminated-string-initialization-warning.patch +io_uring-net-fix-accept-multishot-handling.patch -- 2.47.3