From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752752Ab1HKN6j (ORCPT ); Thu, 11 Aug 2011 09:58:39 -0400 Received: from arkanian.console-pimps.org ([212.110.184.194]:60179 "EHLO arkanian.console-pimps.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751821Ab1HKN6g (ORCPT ); Thu, 11 Aug 2011 09:58:36 -0400 From: Matt Fleming To: Oleg Nesterov Cc: linux-kernel@vger.kernel.org, Chris Zankel Subject: [PATCH 34/41] xtensa: No need to reset handler if SA_ONESHOT Date: Thu, 11 Aug 2011 14:57:08 +0100 Message-Id: <1313071035-12047-35-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 get_signal_to_deliver() already resets the signal handler if SA_ONESHOT is set in ka->sa.sa_flags, there's no need to do it again in handle_signal(). Furthermore, because we were modifying ka->sa.sa_handler without holding ->sighand->siglock there's the potential we can race with another thread if it modifies the signal handlers. Cc: Oleg Nesterov Cc: Chris Zankel Signed-off-by: Matt Fleming --- arch/xtensa/kernel/signal.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/arch/xtensa/kernel/signal.c b/arch/xtensa/kernel/signal.c index 4f53770..24655e3 100644 --- a/arch/xtensa/kernel/signal.c +++ b/arch/xtensa/kernel/signal.c @@ -536,9 +536,6 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset) /* Set up the stack frame */ setup_frame(signr, &ka, &info, oldset, regs); - if (ka.sa.sa_flags & SA_ONESHOT) - ka.sa.sa_handler = SIG_DFL; - spin_lock_irq(¤t->sighand->siglock); sigorsets(¤t->blocked, ¤t->blocked, &ka.sa.sa_mask); if (!(ka.sa.sa_flags & SA_NODEFER)) -- 1.7.4.4