From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752343Ab1HKOAo (ORCPT ); Thu, 11 Aug 2011 10:00:44 -0400 Received: from arkanian.console-pimps.org ([212.110.184.194]:60164 "EHLO arkanian.console-pimps.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752591Ab1HKN6Q (ORCPT ); Thu, 11 Aug 2011 09:58:16 -0400 From: Matt Fleming To: Oleg Nesterov Cc: linux-kernel@vger.kernel.org, Richard Weinberger Subject: [PATCH 31/41] um: Don't restore current->blocked on error Date: Thu, 11 Aug 2011 14:57:05 +0100 Message-Id: <1313071035-12047-32-git-send-email-matt@console-pimps.org> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1313071035-12047-1-git-send-email-matt@console-pimps.org> References: <1313071035-12047-1-git-send-email-matt@console-pimps.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Matt Fleming 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_*. Cc: Oleg Nesterov Cc: Richard Weinberger Signed-off-by: Matt Fleming --- 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 1812524..d177685 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 { sigset_t blocked: sigorsets(&blocked, ¤t->blocked, &ka->sa.sa_mask); -- 1.7.4.4