leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
native rt_sigreturn() doesn't...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
Al Viro 2011-08-18 20:00:29 +01:00 committed by Richard Weinberger
parent 78722a445b
commit 3c916fec12
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/um/sys-x86_64/signal.c
View File

@ -44,10 +44,10 @@ void copy_sc(struct uml_pt_regs *regs, void *from)
} }
static int copy_sc_from_user(struct pt_regs *regs, static int copy_sc_from_user(struct pt_regs *regs,
struct sigcontext __user *from, struct sigcontext __user *from)
struct _fpstate __user *fpp)
{ {
struct user_i387_struct fp; struct user_i387_struct fp;
void __user *buf;
int err = 0; int err = 0;
#define GETREG(regs, regno, sc, regname) \ #define GETREG(regs, regno, sc, regname) \
@ -78,7 +78,11 @@ static int copy_sc_from_user(struct pt_regs *regs,
#undef GETREG #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) if (err)
return 1; return 1;
@ -272,8 +276,7 @@ long sys_rt_sigreturn(struct pt_regs *regs)
sigdelsetmask(&set, ~_BLOCKABLE); sigdelsetmask(&set, ~_BLOCKABLE);
set_current_blocked(&set); set_current_blocked(&set);
if (copy_sc_from_user(&current->thread.regs, &uc->uc_mcontext, if (copy_sc_from_user(&current->thread.regs, &uc->uc_mcontext))
&frame->fpstate))
goto segfault; goto segfault;
/* Avoid ERESTART handling */ /* Avoid ERESTART handling */