x86: ia32_signal: do save_i387_xstate_ia32 at get_sigframe()

Impact: cleanup

move calling save_i387_xstate_ia32() into get_sigframe() from
setup_sigcontext().

Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
index 4bc02b23674b5dfaaf91e813fb2be320dc57cd23..47ddc23f4f5414289684fdf2cf3582e9b4a7ce63 100644 (file)
--- a/arch/x86/ia32/ia32_signal.c
+++ b/arch/x86/ia32/ia32_signal.c
@@ -367,12 +367,7 @@ static int ia32_setup_sigcontext(struct sigcontext_ia32 __user *sc,
        err |= __put_user(regs->flags, &sc->flags);
        err |= __put_user(regs->sp, &sc->sp_at_signal);
 
-       tmp = save_i387_xstate_ia32(fpstate);
-       if (tmp < 0)
-               err = -EFAULT;
-       else
-               err |= __put_user(ptr_to_compat(tmp ? fpstate : NULL),
-                                       &sc->fpstate);
+       err |= __put_user(ptr_to_compat(fpstate), &sc->fpstate);
 
        /* non-iBCS2 extensions.. */
        err |= __put_user(mask, &sc->oldmask);
@@ -408,6 +403,8 @@ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
        if (used_math()) {
                sp = sp - sig_xstate_ia32_size;
                *fpstate = (struct _fpstate_ia32 *) sp;
+               if (save_i387_xstate_ia32(*fpstate) < 0)
+                       return (void __user *) -1L;
        }
 
        sp -= frame_size;