1 files changed, 3 insertions, 8 deletions

diff --git a/fs/io_uring.c b/fs/io_uring.c
index d682049c07b2..e2a66e12fbc6 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -2400,7 +2400,6 @@ static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events,
                           const sigset_t __user *sig, size_t sigsz)
 {
         struct io_cq_ring *ring = ctx->cq_ring;
-        sigset_t ksigmask, sigsaved;
         int ret;
 
         if (io_cqring_events(ring) >= min_events)
@@ -2410,21 +2409,17 @@ static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events,
 #ifdef CONFIG_COMPAT
                 if (in_compat_syscall())
                         ret = set_compat_user_sigmask((const compat_sigset_t __user *)sig,
-                                                      &ksigmask, &sigsaved, sigsz);
+                                                      sigsz);
                 else
 #endif
-                        ret = set_user_sigmask(sig, &ksigmask,
-                                               &sigsaved, sigsz);
+                        ret = set_user_sigmask(sig, sigsz);
 
                 if (ret)
                         return ret;
         }
 
         ret = wait_event_interruptible(ctx->wait, io_cqring_events(ring) >= min_events);
-
-        if (sig)
-                restore_user_sigmask(sig, &sigsaved, ret == -ERESTARTSYS);
-
+        restore_saved_sigmask_unless(ret == -ERESTARTSYS);
         if (ret == -ERESTARTSYS)
                 ret = -EINTR;