commit 3c916fec12ab614aca5cf6ec09ae3adc6b911193
author Al Viro <viro@ftp.linux.org.uk> Thu Aug 18 20:00:29 2011 +0100
committer Richard Weinberger <richard@nod.at> Wed Nov 02 14:14:41 2011 +0100
tree 60d3d645482cfc080563a102fb7fbb84fd7ac4b8
parent 78722a445bb253fa6bcbe9d6589f27db78056af6

um: don't rely on sc.fpstate not having been reassigned prior to rt_sigreturn()

native rt_sigreturn() doesn't...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>

arch/um/sys-x86_64/signal.c

diff --git a/arch/um/sys-x86_64/signal.c b/arch/um/sys-x86_64/signal.c
index 581b64d..ccfa554 100644
--- a/arch/um/sys-x86_64/signal.c
+++ b/arch/um/sys-x86_64/signal.c
@@ -44,10 +44,10 @@
 }
 
 static int copy_sc_from_user(struct pt_regs *regs,
-			     struct sigcontext __user *from,
-			     struct _fpstate __user *fpp)
+			     struct sigcontext __user *from)
 {
 	struct user_i387_struct fp;
+	void __user *buf;
 	int err = 0;
 
 #define GETREG(regs, regno, sc, regname)				\
@@ -78,7 +78,11 @@
 
 #undef GETREG
 
-	err = copy_from_user(&fp, fpp, sizeof(struct user_i387_struct));
+	err = __get_user(buf, &from->fpstate);
+	if (err)
+		return 1;
+
+	err = copy_from_user(&fp, buf, sizeof(struct user_i387_struct));
 	if (err)
 		return 1;
 
@@ -272,8 +276,7 @@
 	sigdelsetmask(&set, ~_BLOCKABLE);
 	set_current_blocked(&set);
 
-	if (copy_sc_from_user(&current->thread.regs, &uc->uc_mcontext,
-			      &frame->fpstate))
+	if (copy_sc_from_user(&current->thread.regs, &uc->uc_mcontext))
 		goto segfault;
 
 	/* Avoid ERESTART handling */