1 files changed, 16 insertions, 13 deletions

diff --git a/arch/x86/um/signal.c b/arch/x86/um/signal.c
index 4883b9546016..bb0fb03b9f85 100644
--- a/arch/x86/um/signal.c
+++ b/arch/x86/um/signal.c
@@ -156,6 +156,9 @@ static int copy_sc_from_user(struct pt_regs *regs,
         struct sigcontext sc;
         int err, pid;
 
+        /* Always make any pending restarted system calls return -EINTR */
+        current_thread_info()->restart_block.fn = do_no_restart_syscall;
+
         err = copy_from_user(&sc, from, sizeof(sc));
         if (err)
                 return err;
@@ -410,9 +413,9 @@ int setup_signal_stack_sc(unsigned long stack_top, int sig,
 
         PT_REGS_SP(regs) = (unsigned long) frame;
         PT_REGS_IP(regs) = (unsigned long) ka->sa.sa_handler;
-        PT_REGS_EAX(regs) = (unsigned long) sig;
-        PT_REGS_EDX(regs) = (unsigned long) 0;
-        PT_REGS_ECX(regs) = (unsigned long) 0;
+        PT_REGS_AX(regs) = (unsigned long) sig;
+        PT_REGS_DX(regs) = (unsigned long) 0;
+        PT_REGS_CX(regs) = (unsigned long) 0;
 
         if ((current->ptrace & PT_DTRACE) && (current->ptrace & PT_PTRACED))
                 ptrace_notify(SIGTRAP);
@@ -460,9 +463,9 @@ int setup_signal_stack_si(unsigned long stack_top, int sig,
 
         PT_REGS_SP(regs) = (unsigned long) frame;
         PT_REGS_IP(regs) = (unsigned long) ka->sa.sa_handler;
-        PT_REGS_EAX(regs) = (unsigned long) sig;
-        PT_REGS_EDX(regs) = (unsigned long) &frame->info;
-        PT_REGS_ECX(regs) = (unsigned long) &frame->uc;
+        PT_REGS_AX(regs) = (unsigned long) sig;
+        PT_REGS_DX(regs) = (unsigned long) &frame->info;
+        PT_REGS_CX(regs) = (unsigned long) &frame->uc;
 
         if ((current->ptrace & PT_DTRACE) && (current->ptrace & PT_PTRACED))
                 ptrace_notify(SIGTRAP);
@@ -541,8 +544,8 @@ int setup_signal_stack_si(unsigned long stack_top, int sig,
                                set->sig[0]);
         err |= __put_user(&frame->fpstate, &frame->uc.uc_mcontext.fpstate);
         if (sizeof(*set) == 16) {
-                __put_user(set->sig[0], &frame->uc.uc_sigmask.sig[0]);
-                __put_user(set->sig[1], &frame->uc.uc_sigmask.sig[1]);
+                err |= __put_user(set->sig[0], &frame->uc.uc_sigmask.sig[0]);
+                err |= __put_user(set->sig[1], &frame->uc.uc_sigmask.sig[1]);
         }
         else
                 err |= __copy_to_user(&frame->uc.uc_sigmask, set,
@@ -570,17 +573,17 @@ int setup_signal_stack_si(unsigned long stack_top, int sig,
         }
 
         PT_REGS_SP(regs) = (unsigned long) frame;
-        PT_REGS_RDI(regs) = sig;
+        PT_REGS_DI(regs) = sig;
         /* In case the signal handler was declared without prototypes */
-        PT_REGS_RAX(regs) = 0;
+        PT_REGS_AX(regs) = 0;
 
         /*
          * This also works for non SA_SIGINFO handlers because they expect the
          * next argument after the signal number on the stack.
          */
-        PT_REGS_RSI(regs) = (unsigned long) &frame->info;
-        PT_REGS_RDX(regs) = (unsigned long) &frame->uc;
-        PT_REGS_RIP(regs) = (unsigned long) ka->sa.sa_handler;
+        PT_REGS_SI(regs) = (unsigned long) &frame->info;
+        PT_REGS_DX(regs) = (unsigned long) &frame->uc;
+        PT_REGS_IP(regs) = (unsigned long) ka->sa.sa_handler;
  out:
         return err;
 }