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

Commit 78722a44 authored by Al Viro's avatar Al Viro Committed by Richard Weinberger
Browse files

um: switch {rt_,}sigreturn() to set_current_blocked() 



same story as on x86 native...

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

arch/um/sys-i386/signal.c

+2 −10
Original line number Original line Diff line number Diff line
@@ -458,11 +458,7 @@ long sys_sigreturn(struct pt_regs regs) 
		goto segfault;

		goto segfault;





	sigdelsetmask(&set, ~_BLOCKABLE);

	sigdelsetmask(&set, ~_BLOCKABLE);



	set_current_blocked(&set);

	spin_lock_irq(&current->sighand->siglock);

	current->blocked = set;

	recalc_sigpending();

	spin_unlock_irq(&current->sighand->siglock);





	if (copy_sc_from_user(&current->thread.regs, sc))

	if (copy_sc_from_user(&current->thread.regs, sc))

		goto segfault;

		goto segfault;
@@ -489,11 +485,7 @@ long sys_rt_sigreturn(struct pt_regs regs) 
		goto segfault;

		goto segfault;





	sigdelsetmask(&set, ~_BLOCKABLE);

	sigdelsetmask(&set, ~_BLOCKABLE);



	set_current_blocked(&set);

	spin_lock_irq(&current->sighand->siglock);

	current->blocked = set;

	recalc_sigpending();

	spin_unlock_irq(&current->sighand->siglock);





	if (copy_sc_from_user(&current->thread.regs, &uc->uc_mcontext))

	if (copy_sc_from_user(&current->thread.regs, &uc->uc_mcontext))

		goto segfault;

		goto segfault;

arch/um/sys-x86_64/signal.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -270,11 +270,7 @@ long sys_rt_sigreturn(struct pt_regs *regs) 
		goto segfault;

		goto segfault;





	sigdelsetmask(&set, ~_BLOCKABLE);

	sigdelsetmask(&set, ~_BLOCKABLE);



	set_current_blocked(&set);

	spin_lock_irq(&current->sighand->siglock);

	current->blocked = set;

	recalc_sigpending();

	spin_unlock_irq(&current->sighand->siglock);





	if (copy_sc_from_user(&current->thread.regs, &uc->uc_mcontext,

	if (copy_sc_from_user(&current->thread.regs, &uc->uc_mcontext,

			      &frame->fpstate))

			      &frame->fpstate))