From: Matt Fleming <matt.fleming@intel.com>
Date: Fri, 19 Aug 2011 16:46:50 +0000 (+0100)
Subject: um: Don't restore current->blocked on error
X-Git-Tag: next-20110826~16^2~5
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=40b8df421418261cb29a5aeb3275d84cfedaf5c9;p=karo-tx-linux.git

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: Oleg Nesterov <oleg@redhat.com>
---

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(&current->sighand->siglock);
-		current->blocked = *oldset;
-		recalc_sigpending();
-		spin_unlock_irq(&current->sighand->siglock);
+	if (err)
 		force_sigsegv(signr, current);
-	} else
+	else
 		block_sigmask(ka, signr);
 
 	return err;