Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f6adb9a6aec0ec9540e15f354e5cdec88b2aea33

Authored by Matt Fleming
Committed by Linus Torvalds
1 parent 6629326b89
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 1 changed file with 2 additions and 6 deletions Side-by-side Diff

arch/um/kernel/signal.c
Diff comments   View file @ f6adb9a
... ... @@ -65,13 +65,9 @@
65 65 #endif
66 66 err = setup_signal_stack_si(sp, signr, ka, regs, info, oldset);
67 67  
68   - if (err) {
69   - spin_lock_irq(&current->sighand->siglock);
70   - current->blocked = *oldset;
71   - recalc_sigpending();
72   - spin_unlock_irq(&current->sighand->siglock);
  68 + if (err)
73 69 force_sigsegv(signr, current);
74   - } else {
  70 + else {
75 71 spin_lock_irq(&current->sighand->siglock);
76 72 sigorsets(&current->blocked, &current->blocked,
77 73 &ka->sa.sa_mask);