mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
um: don't restore current->blocked on error
If we fail to setup the signal stack frame then we don't need to restore current->blocked because it is not modified by setup_signal_stack_*. Acked-by: Oleg Nesterov <oleg@redhat.com> Acked-by: Richard Weinberger <richard@nod.at> Tested-by: Richard Weinberger <richard@nod.at> Signed-off-by: Matt Fleming <matt.fleming@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
6629326b89
commit
f6adb9a6ae
1 changed files with 2 additions and 6 deletions
|
@ -65,13 +65,9 @@ static int handle_signal(struct pt_regs *regs, unsigned long signr,
|
|||
#endif
|
||||
err = setup_signal_stack_si(sp, signr, ka, regs, info, oldset);
|
||||
|
||||
if (err) {
|
||||
spin_lock_irq(¤t->sighand->siglock);
|
||||
current->blocked = *oldset;
|
||||
recalc_sigpending();
|
||||
spin_unlock_irq(¤t->sighand->siglock);
|
||||
if (err)
|
||||
force_sigsegv(signr, current);
|
||||
} else {
|
||||
else {
|
||||
spin_lock_irq(¤t->sighand->siglock);
|
||||
sigorsets(¤t->blocked, ¤t->blocked,
|
||||
&ka->sa.sa_mask);
|
||||
|
|
Loading…
Reference in a new issue