---

yaml
---
r: 120927
b: refs/heads/master
c: 99ea1b9
h: refs/heads/master
i:
  120925: c4568fc
  120923: 85ed3bc
  120919: e93fdbf
  120911: 498048b
  120895: c99358f
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b33669e817a01dd99ff91df330d504ccfb2e99c
+refs/heads/master: 99ea1b93bf80a287dd70499b96d9c4d06f320ff2

trunk/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;