Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c916fec authored by Al Viro's avatar Al Viro Committed by Richard Weinberger
Browse files

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



native rt_sigreturn() doesn't...

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 78722a44

arch/um/sys-x86_64/signal.c

+8 −5
Original line number Original line Diff line number Diff line
@@ -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 */