cris: missing checks of __get_user()/__put_user() return values

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

2 files changed, 12 insertions, 12 deletions

diff --git a/arch/cris/arch-v10/kernel/signal.c b/arch/cris/arch-v10/kernel/signal.c
index df40fa80480f..e16f8f297f61 100644
--- a/arch/cris/arch-v10/kernel/signal.c
+++ b/arch/cris/arch-v10/kernel/signal.c
@@ -65,10 +65,10 @@ int sys_sigaction(int sig, const struct old_sigaction __user *act,
                 old_sigset_t mask;
                 if (!access_ok(VERIFY_READ, act, sizeof(*act)) ||
                     __get_user(new_ka.sa.sa_handler, &act->sa_handler) ||
-                    __get_user(new_ka.sa.sa_restorer, &act->sa_restorer))
+                    __get_user(new_ka.sa.sa_restorer, &act->sa_restorer) ||
+                     __get_user(new_ka.sa.sa_flags, &act->sa_flags) ||
+                     __get_user(mask, &act->sa_mask))
                         return -EFAULT;
-                __get_user(new_ka.sa.sa_flags, &act->sa_flags);
-                __get_user(mask, &act->sa_mask);
                 siginitset(&new_ka.sa.sa_mask, mask);
         }
 
@@ -77,10 +77,10 @@ int sys_sigaction(int sig, const struct old_sigaction __user *act,
         if (!ret && oact) {
                 if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)) ||
                     __put_user(old_ka.sa.sa_handler, &oact->sa_handler) ||
-                    __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer))
+                    __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer) ||
+                    __put_user(old_ka.sa.sa_flags, &oact->sa_flags) ||
+                    __put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask))
                         return -EFAULT;
-                __put_user(old_ka.sa.sa_flags, &oact->sa_flags);
-                __put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask);
         }
 
         return ret;
diff --git a/arch/cris/arch-v32/kernel/signal.c b/arch/cris/arch-v32/kernel/signal.c
index a45efc7df748..b338d8fc0c12 100644
--- a/arch/cris/arch-v32/kernel/signal.c
+++ b/arch/cris/arch-v32/kernel/signal.c
@@ -79,11 +79,11 @@ sys_sigaction(int signal, const struct old_sigaction *act,
 
                 if (!access_ok(VERIFY_READ, act, sizeof(*act)) ||
                     __get_user(newk.sa.sa_handler, &act->sa_handler) ||
-                    __get_user(newk.sa.sa_restorer, &act->sa_restorer))
+                    __get_user(newk.sa.sa_restorer, &act->sa_restorer) ||
+                    __get_user(newk.sa.sa_flags, &act->sa_flags) ||
+                    __get_user(mask, &act->sa_mask))
                         return -EFAULT;
 
-                __get_user(newk.sa.sa_flags, &act->sa_flags);
-                __get_user(mask, &act->sa_mask);
                 siginitset(&newk.sa.sa_mask, mask);
         }
 
@@ -92,11 +92,11 @@ sys_sigaction(int signal, const struct old_sigaction *act,
         if (!retval && oact) {
                 if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)) ||
                     __put_user(oldk.sa.sa_handler, &oact->sa_handler) ||
-                    __put_user(oldk.sa.sa_restorer, &oact->sa_restorer))
+                    __put_user(oldk.sa.sa_restorer, &oact->sa_restorer) ||
+                    __put_user(oldk.sa.sa_flags, &oact->sa_flags) ||
+                    __put_user(oldk.sa.sa_mask.sig[0], &oact->sa_mask))
                         return -EFAULT;
 
-                __put_user(oldk.sa.sa_flags, &oact->sa_flags);
-                __put_user(oldk.sa.sa_mask.sig[0], &oact->sa_mask);
         }
 
         return retval;