[uml-devel] Subject: [PATCH 09/91] um: don't rely on sc.fpstate not having been reassigned prior to rt_sigreturn()

[Al Viro]

native rt_sigreturn() doesn't...

Signed-off-by: Al Viro <v...@zeniv.linux.org.uk>
---
 arch/um/sys-x86_64/signal.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

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 @@ void copy_sc(struct uml_pt_regs *regs, void *from)
 }
 
 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 @@ static int copy_sc_from_user(struct pt_regs *regs,
 
 #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 @@ long sys_rt_sigreturn(struct pt_regs *regs)
        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 */
-- 
1.7.2.5



------------------------------------------------------------------------------
Get a FREE DOWNLOAD! and learn more about uberSVN rich system, 
user administration capabilities and model configuration. Take 
the hassle out of deploying and managing Subversion and the 
tools developers use with it. http://p.sf.net/sfu/wandisco-d2d-2
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel