1 files changed, 21 insertions, 24 deletions

diff --git a/arch/x86/um/signal.c b/arch/x86/um/signal.c
index 5e04a1c899fa..79d824551c1a 100644
--- a/arch/x86/um/signal.c
+++ b/arch/x86/um/signal.c
@@ -370,13 +370,12 @@ struct rt_sigframe
         char retcode[8];
 };
 
-int setup_signal_stack_sc(unsigned long stack_top, int sig,
-                          struct k_sigaction *ka, struct pt_regs *regs,
-                          sigset_t *mask)
+int setup_signal_stack_sc(unsigned long stack_top, struct ksignal *ksig,
+                          struct pt_regs *regs, sigset_t *mask)
 {
         struct sigframe __user *frame;
         void __user *restorer;
-        int err = 0;
+        int err = 0, sig = ksig->sig;
 
         /* This is the same calculation as i386 - ((sp + 4) & 15) == 0 */
         stack_top = ((stack_top + 4) & -16UL) - 4;
@@ -385,8 +384,8 @@ int setup_signal_stack_sc(unsigned long stack_top, int sig,
                 return 1;
 
         restorer = frame->retcode;
-        if (ka->sa.sa_flags & SA_RESTORER)
-                restorer = ka->sa.sa_restorer;
+        if (ksig->ka.sa.sa_flags & SA_RESTORER)
+                restorer = ksig->ka.sa.sa_restorer;
 
         err |= __put_user(restorer, &frame->pretcode);
         err |= __put_user(sig, &frame->sig);
@@ -410,20 +409,19 @@ int setup_signal_stack_sc(unsigned long stack_top, int sig,
                 return err;
 
         PT_REGS_SP(regs) = (unsigned long) frame;
-        PT_REGS_IP(regs) = (unsigned long) ka->sa.sa_handler;
+        PT_REGS_IP(regs) = (unsigned long) ksig->ka.sa.sa_handler;
         PT_REGS_AX(regs) = (unsigned long) sig;
         PT_REGS_DX(regs) = (unsigned long) 0;
         PT_REGS_CX(regs) = (unsigned long) 0;
         return 0;
 }
 
-int setup_signal_stack_si(unsigned long stack_top, int sig,
-                          struct k_sigaction *ka, struct pt_regs *regs,
-                          siginfo_t *info, sigset_t *mask)
+int setup_signal_stack_si(unsigned long stack_top, struct ksignal *ksig,
+                          struct pt_regs *regs, sigset_t *mask)
 {
         struct rt_sigframe __user *frame;
         void __user *restorer;
-        int err = 0;
+        int err = 0, sig = ksig->sig;
 
         stack_top &= -8UL;
         frame = (struct rt_sigframe __user *) stack_top - 1;
@@ -431,14 +429,14 @@ int setup_signal_stack_si(unsigned long stack_top, int sig,
                 return 1;
 
         restorer = frame->retcode;
-        if (ka->sa.sa_flags & SA_RESTORER)
-                restorer = ka->sa.sa_restorer;
+        if (ksig->ka.sa.sa_flags & SA_RESTORER)
+                restorer = ksig->ka.sa.sa_restorer;
 
         err |= __put_user(restorer, &frame->pretcode);
         err |= __put_user(sig, &frame->sig);
         err |= __put_user(&frame->info, &frame->pinfo);
         err |= __put_user(&frame->uc, &frame->puc);
-        err |= copy_siginfo_to_user(&frame->info, info);
+        err |= copy_siginfo_to_user(&frame->info, &ksig->info);
         err |= copy_ucontext_to_user(&frame->uc, &frame->fpstate, mask,
                                         PT_REGS_SP(regs));
 
@@ -457,7 +455,7 @@ int setup_signal_stack_si(unsigned long stack_top, int sig,
                 return err;
 
         PT_REGS_SP(regs) = (unsigned long) frame;
-        PT_REGS_IP(regs) = (unsigned long) ka->sa.sa_handler;
+        PT_REGS_IP(regs) = (unsigned long) ksig->ka.sa.sa_handler;
         PT_REGS_AX(regs) = (unsigned long) sig;
         PT_REGS_DX(regs) = (unsigned long) &frame->info;
         PT_REGS_CX(regs) = (unsigned long) &frame->uc;
@@ -502,12 +500,11 @@ struct rt_sigframe
         struct _fpstate fpstate;
 };
 
-int setup_signal_stack_si(unsigned long stack_top, int sig,
-                          struct k_sigaction *ka, struct pt_regs * regs,
-                          siginfo_t *info, sigset_t *set)
+int setup_signal_stack_si(unsigned long stack_top, struct ksignal *ksig,
+                          struct pt_regs *regs, sigset_t *set)
 {
         struct rt_sigframe __user *frame;
-        int err = 0;
+        int err = 0, sig = ksig->sig;
 
         frame = (struct rt_sigframe __user *)
                 round_down(stack_top - sizeof(struct rt_sigframe), 16);
@@ -517,8 +514,8 @@ int setup_signal_stack_si(unsigned long stack_top, int sig,
         if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
                 goto out;
 
-        if (ka->sa.sa_flags & SA_SIGINFO) {
-                err |= copy_siginfo_to_user(&frame->info, info);
+        if (ksig->ka.sa.sa_flags & SA_SIGINFO) {
+                err |= copy_siginfo_to_user(&frame->info, &ksig->info);
                 if (err)
                         goto out;
         }
@@ -543,8 +540,8 @@ int setup_signal_stack_si(unsigned long stack_top, int sig,
          * already in userspace.
          */
         /* x86-64 should always use SA_RESTORER. */
-        if (ka->sa.sa_flags & SA_RESTORER)
-                err |= __put_user(ka->sa.sa_restorer, &frame->pretcode);
+        if (ksig->ka.sa.sa_flags & SA_RESTORER)
+                err |= __put_user(ksig->ka.sa.sa_restorer, &frame->pretcode);
         else
                 /* could use a vstub here */
                 return err;
@@ -570,7 +567,7 @@ int setup_signal_stack_si(unsigned long stack_top, int sig,
          */
         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;
+        PT_REGS_IP(regs) = (unsigned long) ksig->ka.sa.sa_handler;
  out:
         return err;
 }