From 40b8df421418261cb29a5aeb3275d84cfedaf5c9 Mon Sep 17 00:00:00 2001 From: Matt Fleming Date: Fri, 19 Aug 2011 17:46:50 +0100 Subject: [PATCH] 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 Acked-by: Richard Weinberger Tested-by: Richard Weinberger Signed-off-by: Matt Fleming Signed-off-by: Oleg Nesterov --- arch/um/kernel/signal.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/um/kernel/signal.c b/arch/um/kernel/signal.c index 9aa5cbaa23f4..9a5ffe1f0293 100644 --- a/arch/um/kernel/signal.c +++ b/arch/um/kernel/signal.c @@ -66,13 +66,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 block_sigmask(ka, signr); return err; -- 2.39.5