From 220cf25b4a9b06d1e9f72bfe1906155281fd60d3 Mon Sep 17 00:00:00 2001
From: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Date: Wed, 5 Nov 2008 18:32:54 -0800
Subject: [PATCH] --- yaml --- r: 120927 b: refs/heads/master c:
 99ea1b93bf80a287dd70499b96d9c4d06f320ff2 h: refs/heads/master i:   120925:
 c4568fce433e108897d3f7ae27c04c915dc5c945   120923:
 85ed3bce2f44fd656a1559c1bea7bafa27909700   120919:
 e93fdbfe95734f136376928f035e2c7fb6aa141e   120911:
 498048bcee3a052d1093a13f877874442481dc26   120895:
 c99358f3693fd0c2340346211376fb6e43999ab2 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/x86/ia32/ia32_signal.c | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 2df660015b9c..eaba40011b42 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b33669e817a01dd99ff91df330d504ccfb2e99c
+refs/heads/master: 99ea1b93bf80a287dd70499b96d9c4d06f320ff2
diff --git a/trunk/arch/x86/ia32/ia32_signal.c b/trunk/arch/x86/ia32/ia32_signal.c
index 4bc02b23674b..47ddc23f4f54 100644
--- a/trunk/arch/x86/ia32/ia32_signal.c
+++ b/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;