From: Matt Fleming <matt.flem...@intel.com> 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 <o...@redhat.com> Acked-by: Richard Weinberger <rich...@nod.at> Tested-by: Richard Weinberger <rich...@nod.at> Cc: user-mode-linux-devel@lists.sourceforge.net Signed-off-by: Matt Fleming <matt.flem...@intel.com> --- arch/um/kernel/signal.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/um/kernel/signal.c b/arch/um/kernel/signal.c index e8b889d..8382e0b 100644 --- a/arch/um/kernel/signal.c +++ b/arch/um/kernel/signal.c @@ -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); -- 1.7.4.4 ------------------------------------------------------------------------------ Keep Your Developer Skills Current with LearnDevNow! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-d2d _______________________________________________ User-mode-linux-devel mailing list User-mode-linux-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel