1 files changed, 19 insertions, 12 deletions

diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
index 673ac9b63d6b..efc6a958b71d 100644
--- a/arch/x86/ia32/ia32_signal.c
+++ b/arch/x86/ia32/ia32_signal.c
@@ -32,6 +32,7 @@
 #include <asm/sigframe.h>
 #include <asm/sighandling.h>
 #include <asm/sys_ia32.h>
+#include <asm/smap.h>
 
 #define FIX_EFLAGS      __FIX_EFLAGS
 
@@ -162,7 +163,8 @@ asmlinkage long sys32_sigaltstack(const stack_ia32_t __user *uss_ptr,
         }
         seg = get_fs();
         set_fs(KERNEL_DS);
-        ret = do_sigaltstack(uss_ptr ? &uss : NULL, &uoss, regs->sp);
+        ret = do_sigaltstack((stack_t __force __user *) (uss_ptr ? &uss : NULL),
+                             (stack_t __force __user *) &uoss, regs->sp);
         set_fs(seg);
         if (ret >= 0 && uoss_ptr)  {
                 if (!access_ok(VERIFY_WRITE, uoss_ptr, sizeof(stack_ia32_t)))
@@ -250,11 +252,12 @@ static int ia32_restore_sigcontext(struct pt_regs *regs,
 
                 get_user_ex(tmp, &sc->fpstate);
                 buf = compat_ptr(tmp);
-                err |= restore_i387_xstate_ia32(buf);
 
                 get_user_ex(*pax, &sc->ax);
         } get_user_catch(err);
 
+        err |= restore_xstate_sig(buf, 1);
+
         return err;
 }
 
@@ -361,7 +364,7 @@ static int ia32_setup_sigcontext(struct sigcontext_ia32 __user *sc,
  */
 static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
                                  size_t frame_size,
-                                 void **fpstate)
+                                 void __user **fpstate)
 {
         unsigned long sp;
 
@@ -381,9 +384,12 @@ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
                 sp = (unsigned long) ka->sa.sa_restorer;
 
         if (used_math()) {
-                sp = sp - sig_xstate_ia32_size;
-                *fpstate = (struct _fpstate_ia32 *) sp;
-                if (save_i387_xstate_ia32(*fpstate) < 0)
+                unsigned long fx_aligned, math_size;
+
+                sp = alloc_mathframe(sp, 1, &fx_aligned, &math_size);
+                *fpstate = (struct _fpstate_ia32 __user *) sp;
+                if (save_xstate_sig(*fpstate, (void __user *)fx_aligned,
+                                    math_size) < 0)
                         return (void __user *) -1L;
         }
 
@@ -448,7 +454,7 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,
                  * These are actually not used anymore, but left because some
                  * gdb versions depend on them as a marker.
                  */
-                put_user_ex(*((u64 *)&code), (u64 *)frame->retcode);
+                put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
         } put_user_catch(err);
 
         if (err)
@@ -502,7 +508,6 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                 put_user_ex(sig, &frame->sig);
                 put_user_ex(ptr_to_compat(&frame->info), &frame->pinfo);
                 put_user_ex(ptr_to_compat(&frame->uc), &frame->puc);
-                err |= copy_siginfo_to_user32(&frame->info, info);
 
                 /* Create the ucontext.  */
                 if (cpu_has_xsave)
@@ -514,9 +519,6 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                 put_user_ex(sas_ss_flags(regs->sp),
                             &frame->uc.uc_stack.ss_flags);
                 put_user_ex(current->sas_ss_size, &frame->uc.uc_stack.ss_size);
-                err |= ia32_setup_sigcontext(&frame->uc.uc_mcontext, fpstate,
-                                             regs, set->sig[0]);
-                err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
 
                 if (ka->sa.sa_flags & SA_RESTORER)
                         restorer = ka->sa.sa_restorer;
@@ -529,9 +531,14 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                  * Not actually used anymore, but left because some gdb
                  * versions need it.
                  */
-                put_user_ex(*((u64 *)&code), (u64 *)frame->retcode);
+                put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
         } put_user_catch(err);
 
+        err |= copy_siginfo_to_user32(&frame->info, info);
+        err |= ia32_setup_sigcontext(&frame->uc.uc_mcontext, fpstate,
+                                     regs, set->sig[0]);
+        err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
+
         if (err)
                 return -EFAULT;