Pull video into test branch

[linux-drm-fsl-dcu.git] / arch / s390 / kernel / signal.c

diff --git a/arch/s390/kernel/signal.c b/arch/s390/kernel/signal.c
index d48cfc726b68d9e2fbe3b7968c2283dd476e71de..4c8a7954ef48b28274cdf61833e9f31609f2ff70 100644 (file)
--- a/arch/s390/kernel/signal.c
+++ b/arch/s390/kernel/signal.c
@@ -11,7 +11,6 @@
  *  1997-11-28  Modified for POSIX.1b signals by Richard Henderson
  */
 
-#include <linux/config.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
 #include <linux/smp.h>
@@ -81,10 +80,10 @@ 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);
        }
 
@@ -93,10 +92,10 @@ 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;
@@ -114,58 +113,50 @@ sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss,
 /* Returns non-zero on fault. */
 static int save_sigregs(struct pt_regs *regs, _sigregs __user *sregs)
 {
-       unsigned long old_mask = regs->psw.mask;
-       int err;
-  
+       _sigregs user_sregs;
+
        save_access_regs(current->thread.acrs);
 
        /* Copy a 'clean' PSW mask to the user to avoid leaking
           information about whether PER is currently on.  */
-       regs->psw.mask = PSW_MASK_MERGE(PSW_USER_BITS, regs->psw.mask);
-       err = __copy_to_user(&sregs->regs.psw, &regs->psw,
-                            sizeof(sregs->regs.psw)+sizeof(sregs->regs.gprs));
-       regs->psw.mask = old_mask;
-       if (err != 0)
-               return err;
-       err = __copy_to_user(&sregs->regs.acrs, current->thread.acrs,
-                            sizeof(sregs->regs.acrs));
-       if (err != 0)
-               return err;
+       user_sregs.regs.psw.mask = PSW_MASK_MERGE(PSW_USER_BITS, regs->psw.mask);
+       user_sregs.regs.psw.addr = regs->psw.addr;
+       memcpy(&user_sregs.regs.gprs, &regs->gprs, sizeof(sregs->regs.gprs));
+       memcpy(&user_sregs.regs.acrs, current->thread.acrs,
+              sizeof(sregs->regs.acrs));
        /* 
         * We have to store the fp registers to current->thread.fp_regs
         * to merge them with the emulated registers.
         */
        save_fp_regs(&current->thread.fp_regs);
-       return __copy_to_user(&sregs->fpregs, &current->thread.fp_regs,
-                             sizeof(s390_fp_regs));
+       memcpy(&user_sregs.fpregs, &current->thread.fp_regs,
+              sizeof(s390_fp_regs));
+       return __copy_to_user(sregs, &user_sregs, sizeof(_sigregs));
 }
 
 /* Returns positive number on error */
 static int restore_sigregs(struct pt_regs *regs, _sigregs __user *sregs)
 {
-       unsigned long old_mask = regs->psw.mask;
        int err;
+       _sigregs user_sregs;
 
        /* Alwys make any pending restarted system call return -EINTR */
        current_thread_info()->restart_block.fn = do_no_restart_syscall;
 
-       err = __copy_from_user(&regs->psw, &sregs->regs.psw,
-                              sizeof(sregs->regs.psw)+sizeof(sregs->regs.gprs));
-       regs->psw.mask = PSW_MASK_MERGE(old_mask, regs->psw.mask);
-       regs->psw.addr |= PSW_ADDR_AMODE;
-       if (err)
-               return err;
-       err = __copy_from_user(&current->thread.acrs, &sregs->regs.acrs,
-                              sizeof(sregs->regs.acrs));
+       err = __copy_from_user(&user_sregs, sregs, sizeof(_sigregs));
        if (err)
                return err;
+       regs->psw.mask = PSW_MASK_MERGE(regs->psw.mask,
+                                       user_sregs.regs.psw.mask);
+       regs->psw.addr = PSW_ADDR_AMODE | user_sregs.regs.psw.addr;
+       memcpy(&regs->gprs, &user_sregs.regs.gprs, sizeof(sregs->regs.gprs));
+       memcpy(&current->thread.acrs, &user_sregs.regs.acrs,
+              sizeof(sregs->regs.acrs));
        restore_access_regs(current->thread.acrs);
 
-       err = __copy_from_user(&current->thread.fp_regs, &sregs->fpregs,
-                              sizeof(s390_fp_regs));
+       memcpy(&current->thread.fp_regs, &user_sregs.fpregs,
+              sizeof(s390_fp_regs));
        current->thread.fp_regs.fpc &= FPC_VALID_MASK;
-       if (err)
-               return err;
 
        restore_fp_regs(&current->thread.fp_regs);
        regs->trap = -1;        /* disable syscall checks */
@@ -458,6 +449,7 @@ void do_signal(struct pt_regs *regs)
                case -ERESTART_RESTARTBLOCK:
                        regs->gprs[2] = -EINTR;
                }
+               regs->trap = -1;        /* Don't deal with this again. */
        }
 
        /* Get signal to deliver.  When running under ptrace, at this point