From 4ffedd496885a74894952f35ee60a81ef811d10c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 18 Apr 2024 11:59:56 +0200 Subject: [PATCH] 6.6-stable patches added patches: io_uring-fix-io_cqring_wait-not-restoring-sigmask-on-get_timespec64-failure.patch --- ...ng-sigmask-on-get_timespec64-failure.patch | 67 +++++++++++++++++++ queue-6.6/series | 1 + 2 files changed, 68 insertions(+) create mode 100644 queue-6.6/io_uring-fix-io_cqring_wait-not-restoring-sigmask-on-get_timespec64-failure.patch diff --git a/queue-6.6/io_uring-fix-io_cqring_wait-not-restoring-sigmask-on-get_timespec64-failure.patch b/queue-6.6/io_uring-fix-io_cqring_wait-not-restoring-sigmask-on-get_timespec64-failure.patch new file mode 100644 index 00000000000..8fa2a76ad85 --- /dev/null +++ b/queue-6.6/io_uring-fix-io_cqring_wait-not-restoring-sigmask-on-get_timespec64-failure.patch @@ -0,0 +1,67 @@ +From dbe77812190e4acd1e6db19e21e29ec6dfd3efed Mon Sep 17 00:00:00 2001 +From: Alexey Izbyshev +Date: Fri, 5 Apr 2024 15:55:51 +0300 +Subject: io_uring: Fix io_cqring_wait() not restoring sigmask on get_timespec64() failure + +From: Alexey Izbyshev + +Commit 978e5c19dfefc271e5550efba92fcef0d3f62864 upstream. + +This bug was introduced in commit 950e79dd7313 ("io_uring: minor +io_cqring_wait() optimization"), which was made in preparation for +adc8682ec690 ("io_uring: Add support for napi_busy_poll"). The latter +got reverted in cb3182167325 ("Revert "io_uring: Add support for +napi_busy_poll""), so simply undo the former as well. + +Cc: stable@vger.kernel.org +Fixes: 950e79dd7313 ("io_uring: minor io_cqring_wait() optimization") +Signed-off-by: Alexey Izbyshev +Link: https://lore.kernel.org/r/20240405125551.237142-1-izbyshev@ispras.ru +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman +--- + io_uring/io_uring.c | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +--- a/io_uring/io_uring.c ++++ b/io_uring/io_uring.c +@@ -2559,19 +2559,6 @@ static int io_cqring_wait(struct io_ring + if (__io_cqring_events_user(ctx) >= min_events) + return 0; + +- if (sig) { +-#ifdef CONFIG_COMPAT +- if (in_compat_syscall()) +- ret = set_compat_user_sigmask((const compat_sigset_t __user *)sig, +- sigsz); +- else +-#endif +- ret = set_user_sigmask(sig, sigsz); +- +- if (ret) +- return ret; +- } +- + init_waitqueue_func_entry(&iowq.wq, io_wake_function); + iowq.wq.private = current; + INIT_LIST_HEAD(&iowq.wq.entry); +@@ -2588,6 +2575,19 @@ static int io_cqring_wait(struct io_ring + iowq.timeout = ktime_add_ns(timespec64_to_ktime(ts), ktime_get_ns()); + } + ++ if (sig) { ++#ifdef CONFIG_COMPAT ++ if (in_compat_syscall()) ++ ret = set_compat_user_sigmask((const compat_sigset_t __user *)sig, ++ sigsz); ++ else ++#endif ++ ret = set_user_sigmask(sig, sigsz); ++ ++ if (ret) ++ return ret; ++ } ++ + trace_io_uring_cqring_wait(ctx, min_events); + do { + int nr_wait = (int) iowq.cq_tail - READ_ONCE(ctx->rings->cq.tail); diff --git a/queue-6.6/series b/queue-6.6/series index ef5aa6c1e73..86061010b9a 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -20,3 +20,4 @@ ceph-redirty-page-before-returning-aop_writepage_act.patch selftests-timers-fix-posix_timers-ksft_print_msg-war.patch drm-msm-dpu-populate-sspp-scaler-block-version.patch media-videobuf2-request-more-buffers-for-vb2_read.patch +io_uring-fix-io_cqring_wait-not-restoring-sigmask-on-get_timespec64-failure.patch -- 2.39.5