Merge branch 'master' of git+ssh://galak@master.kernel.org/pub/scm/linux/kernel/git/galak/powerpc

1 files changed, 34 insertions, 1 deletions

diff --git a/arch/mips/kernel/signal_n32.c b/arch/mips/kernel/signal_n32.c
index 384fc4a639a4..3e168c08a3a8 100644
--- a/arch/mips/kernel/signal_n32.c
+++ b/arch/mips/kernel/signal_n32.c
@@ -81,6 +81,39 @@ struct rt_sigframe_n32 {
 #endif
 };
 
+extern void sigset_from_compat (sigset_t *set, compat_sigset_t *compat);
+
+save_static_function(sysn32_rt_sigsuspend);
+__attribute_used__ noinline static int
+_sysn32_rt_sigsuspend(nabi_no_regargs struct pt_regs regs)
+{
+        compat_sigset_t __user *unewset, uset;
+        size_t sigsetsize;
+        sigset_t newset;
+
+        /* XXX Don't preclude handling different sized sigset_t's.  */
+        sigsetsize = regs.regs[5];
+        if (sigsetsize != sizeof(sigset_t))
+                return -EINVAL;
+
+        unewset = (compat_sigset_t __user *) regs.regs[4];
+        if (copy_from_user(&uset, unewset, sizeof(uset)))
+                return -EFAULT;
+        sigset_from_compat (&newset, &uset);
+        sigdelsetmask(&newset, ~_BLOCKABLE);
+
+        spin_lock_irq(&current->sighand->siglock);
+        current->saved_sigmask = current->blocked;
+        current->blocked = newset;
+        recalc_sigpending();
+        spin_unlock_irq(&current->sighand->siglock);
+
+        current->state = TASK_INTERRUPTIBLE;
+        schedule();
+        set_thread_flag(TIF_RESTORE_SIGMASK);
+        return -ERESTARTNOHAND;
+}
+
 save_static_function(sysn32_rt_sigreturn);
 __attribute_used__ noinline static void
 _sysn32_rt_sigreturn(nabi_no_regargs struct pt_regs regs)
@@ -108,7 +141,7 @@ _sysn32_rt_sigreturn(nabi_no_regargs struct pt_regs regs)
         /* The ucontext contains a stack32_t, so we must convert!  */
         if (__get_user(sp, &frame->rs_uc.uc_stack.ss_sp))
                 goto badframe;
-        st.ss_size = (long) sp;
+        st.ss_sp = (void *)(long) sp;
         if (__get_user(st.ss_size, &frame->rs_uc.uc_stack.ss_size))
                 goto badframe;
         if (__get_user(st.ss_flags, &frame->rs_uc.uc_stack.ss_flags))