1 files changed, 8 insertions, 12 deletions

diff --git a/fs/aio.c b/fs/aio.c
index 2d405733a8c6..8327db0c8e08 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -2094,7 +2094,6 @@ SYSCALL_DEFINE6(io_pgetevents,
                 const struct __aio_sigset __user *, usig)
 {
         struct __aio_sigset     ksig = { NULL, };
-        sigset_t                ksigmask, sigsaved;
         struct timespec64       ts;
         bool interrupted;
         int ret;
@@ -2105,14 +2104,14 @@ SYSCALL_DEFINE6(io_pgetevents,
         if (usig && copy_from_user(&ksig, usig, sizeof(ksig)))
                 return -EFAULT;
 
-        ret = set_user_sigmask(ksig.sigmask, &ksigmask, &sigsaved, ksig.sigsetsize);
+        ret = set_user_sigmask(ksig.sigmask, ksig.sigsetsize);
         if (ret)
                 return ret;
 
         ret = do_io_getevents(ctx_id, min_nr, nr, events, timeout ? &ts : NULL);
 
         interrupted = signal_pending(current);
-        restore_user_sigmask(ksig.sigmask, &sigsaved, interrupted);
+        restore_saved_sigmask_unless(interrupted);
         if (interrupted && !ret)
                 ret = -ERESTARTNOHAND;
 
@@ -2130,7 +2129,6 @@ SYSCALL_DEFINE6(io_pgetevents_time32,
                 const struct __aio_sigset __user *, usig)
 {
         struct __aio_sigset     ksig = { NULL, };
-        sigset_t                ksigmask, sigsaved;
         struct timespec64       ts;
         bool interrupted;
         int ret;
@@ -2142,14 +2140,14 @@ SYSCALL_DEFINE6(io_pgetevents_time32,
                 return -EFAULT;
 
 
-        ret = set_user_sigmask(ksig.sigmask, &ksigmask, &sigsaved, ksig.sigsetsize);
+        ret = set_user_sigmask(ksig.sigmask, ksig.sigsetsize);
         if (ret)
                 return ret;
 
         ret = do_io_getevents(ctx_id, min_nr, nr, events, timeout ? &ts : NULL);
 
         interrupted = signal_pending(current);
-        restore_user_sigmask(ksig.sigmask, &sigsaved, interrupted);
+        restore_saved_sigmask_unless(interrupted);
         if (interrupted && !ret)
                 ret = -ERESTARTNOHAND;
 
@@ -2198,7 +2196,6 @@ COMPAT_SYSCALL_DEFINE6(io_pgetevents,
                 const struct __compat_aio_sigset __user *, usig)
 {
         struct __compat_aio_sigset ksig = { NULL, };
-        sigset_t ksigmask, sigsaved;
         struct timespec64 t;
         bool interrupted;
         int ret;
@@ -2209,14 +2206,14 @@ COMPAT_SYSCALL_DEFINE6(io_pgetevents,
         if (usig && copy_from_user(&ksig, usig, sizeof(ksig)))
                 return -EFAULT;
 
-        ret = set_compat_user_sigmask(ksig.sigmask, &ksigmask, &sigsaved, ksig.sigsetsize);
+        ret = set_compat_user_sigmask(ksig.sigmask, ksig.sigsetsize);
         if (ret)
                 return ret;
 
         ret = do_io_getevents(ctx_id, min_nr, nr, events, timeout ? &t : NULL);
 
         interrupted = signal_pending(current);
-        restore_user_sigmask(ksig.sigmask, &sigsaved, interrupted);
+        restore_saved_sigmask_unless(interrupted);
         if (interrupted && !ret)
                 ret = -ERESTARTNOHAND;
 
@@ -2234,7 +2231,6 @@ COMPAT_SYSCALL_DEFINE6(io_pgetevents_time64,
                 const struct __compat_aio_sigset __user *, usig)
 {
         struct __compat_aio_sigset ksig = { NULL, };
-        sigset_t ksigmask, sigsaved;
         struct timespec64 t;
         bool interrupted;
         int ret;
@@ -2245,14 +2241,14 @@ COMPAT_SYSCALL_DEFINE6(io_pgetevents_time64,
         if (usig && copy_from_user(&ksig, usig, sizeof(ksig)))
                 return -EFAULT;
 
-        ret = set_compat_user_sigmask(ksig.sigmask, &ksigmask, &sigsaved, ksig.sigsetsize);
+        ret = set_compat_user_sigmask(ksig.sigmask, ksig.sigsetsize);
         if (ret)
                 return ret;
 
         ret = do_io_getevents(ctx_id, min_nr, nr, events, timeout ? &t : NULL);
 
         interrupted = signal_pending(current);
-        restore_user_sigmask(ksig.sigmask, &sigsaved, interrupted);
+        restore_saved_sigmask_unless(interrupted);
         if (interrupted && !ret)
                 ret = -ERESTARTNOHAND;