1 files changed, 13 insertions, 15 deletions

diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
index 97c1e4b683fc..2cb0c94cafa5 100644
--- a/arch/powerpc/kernel/signal_64.c
+++ b/arch/powerpc/kernel/signal_64.c
@@ -708,20 +708,19 @@ badframe:
         return 0;
 }
 
-int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
-                sigset_t *set, struct pt_regs *regs)
+int handle_rt_signal64(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs)
 {
         struct rt_sigframe __user *frame;
         unsigned long newsp = 0;
         long err = 0;
 
-        frame = get_sigframe(ka, get_tm_stackpointer(regs), sizeof(*frame), 0);
+        frame = get_sigframe(ksig, get_tm_stackpointer(regs), sizeof(*frame), 0);
         if (unlikely(frame == NULL))
                 goto badframe;
 
         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);
         if (err)
                 goto badframe;
 
@@ -736,15 +735,15 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
                 err |= __put_user(&frame->uc_transact, &frame->uc.uc_link);
                 err |= setup_tm_sigcontexts(&frame->uc.uc_mcontext,
                                             &frame->uc_transact.uc_mcontext,
-                                            regs, signr,
+                                            regs, ksig->sig,
                                             NULL,
-                                            (unsigned long)ka->sa.sa_handler);
+                                            (unsigned long)ksig->ka.sa.sa_handler);
         } else
 #endif
         {
                 err |= __put_user(0, &frame->uc.uc_link);
-                err |= setup_sigcontext(&frame->uc.uc_mcontext, regs, signr,
-                                        NULL, (unsigned long)ka->sa.sa_handler,
+                err |= setup_sigcontext(&frame->uc.uc_mcontext, regs, ksig->sig,
+                                        NULL, (unsigned long)ksig->ka.sa.sa_handler,
                                         1);
         }
         err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
@@ -770,7 +769,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
 
         /* Set up "regs" so we "return" to the signal handler. */
         if (is_elf2_task()) {
-                regs->nip = (unsigned long) ka->sa.sa_handler;
+                regs->nip = (unsigned long) ksig->ka.sa.sa_handler;
                 regs->gpr[12] = regs->nip;
         } else {
                 /* Handler is *really* a pointer to the function descriptor for
@@ -779,7 +778,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
                  * entry is the TOC value we need to use.
                  */
                 func_descr_t __user *funct_desc_ptr =
-                        (func_descr_t __user *) ka->sa.sa_handler;
+                        (func_descr_t __user *) ksig->ka.sa.sa_handler;
 
                 err |= get_user(regs->nip, &funct_desc_ptr->entry);
                 err |= get_user(regs->gpr[2], &funct_desc_ptr->toc);
@@ -789,9 +788,9 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
         regs->msr &= ~MSR_LE;
         regs->msr |= (MSR_KERNEL & MSR_LE);
         regs->gpr[1] = newsp;
-        regs->gpr[3] = signr;
+        regs->gpr[3] = ksig->sig;
         regs->result = 0;
-        if (ka->sa.sa_flags & SA_SIGINFO) {
+        if (ksig->ka.sa.sa_flags & SA_SIGINFO) {
                 err |= get_user(regs->gpr[4], (unsigned long __user *)&frame->pinfo);
                 err |= get_user(regs->gpr[5], (unsigned long __user *)&frame->puc);
                 regs->gpr[6] = (unsigned long) frame;
@@ -801,7 +800,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
         if (err)
                 goto badframe;
 
-        return 1;
+        return 0;
 
 badframe:
         if (show_unhandled_signals)
@@ -809,6 +808,5 @@ badframe:
                                    current->comm, current->pid, "setup_rt_frame",
                                    (long)frame, regs->nip, regs->link);
 
-        force_sigsegv(signr, current);
-        return 0;
+        return 1;
 }