All of lore.kernel.org
 help / color / mirror / Atom feed
From: Matt Fleming <matt@console-pimps.org>
To: Oleg Nesterov <oleg@redhat.com>
Cc: linux-kernel@vger.kernel.org, Mikael Starvik <starvik@axis.com>,
	Jesper Nilsson <jesper.nilsson@axis.com>
Subject: [PATCH 06/41] cris: Use set_current_blocked()
Date: Thu, 11 Aug 2011 14:56:40 +0100	[thread overview]
Message-ID: <1313071035-12047-7-git-send-email-matt@console-pimps.org> (raw)
In-Reply-To: <1313071035-12047-1-git-send-email-matt@console-pimps.org>

From: Matt Fleming <matt.fleming@linux.intel.com>

As described in e6fa16ab ("signal: sigprocmask() should do
retarget_shared_pending()") the modification of current->blocked is
incorrect as we need to check whether the signal we're about to block
is pending in the shared queue.

Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: Matt Fleming <matt.fleming@linux.intel.com>
---
 arch/cris/arch-v10/kernel/signal.c |   33 +++++++++++++------------------
 arch/cris/arch-v32/kernel/signal.c |   37 +++++++++++++----------------------
 2 files changed, 28 insertions(+), 42 deletions(-)

diff --git a/arch/cris/arch-v10/kernel/signal.c b/arch/cris/arch-v10/kernel/signal.c
index e78fe49..9f8c29c 100644
--- a/arch/cris/arch-v10/kernel/signal.c
+++ b/arch/cris/arch-v10/kernel/signal.c
@@ -50,12 +50,14 @@ void do_signal(int canrestart, struct pt_regs *regs);
 int sys_sigsuspend(old_sigset_t mask, long r11, long r12, long r13, long mof,
 	long srp, struct pt_regs *regs)
 {
-	mask &= _BLOCKABLE;
-	spin_lock_irq(&current->sighand->siglock);
+	sigset_t blocked;
+
 	current->saved_sigmask = current->blocked;
-	siginitset(&current->blocked, mask);
-	recalc_sigpending();
-	spin_unlock_irq(&current->sighand->siglock);
+
+	mask &= _BLOCKABLE;
+	siginitset(&blocked, mask);
+	set_current_blocked(&blocked);
+
 	current->state = TASK_INTERRUPTIBLE;
 	schedule();
 	set_thread_flag(TIF_RESTORE_SIGMASK);
@@ -184,10 +186,7 @@ asmlinkage int sys_sigreturn(long r10, long r11, long r12, long r13, long mof,
 		goto badframe;
 
 	sigdelsetmask(&set, ~_BLOCKABLE);
-	spin_lock_irq(&current->sighand->siglock);
-	current->blocked = set;
-	recalc_sigpending();
-	spin_unlock_irq(&current->sighand->siglock);
+	set_current_blocked(&set);
 
 	if (restore_sigcontext(regs, &frame->sc))
 		goto badframe;
@@ -223,10 +222,7 @@ asmlinkage int sys_rt_sigreturn(long r10, long r11, long r12, long r13,
 		goto badframe;
 
 	sigdelsetmask(&set, ~_BLOCKABLE);
-	spin_lock_irq(&current->sighand->siglock);
-	current->blocked = set;
-	recalc_sigpending();
-	spin_unlock_irq(&current->sighand->siglock);
+	set_current_blocked(&set);
 
 	if (restore_sigcontext(regs, &frame->uc.uc_mcontext))
 		goto badframe;
@@ -469,13 +465,12 @@ static inline int handle_signal(int canrestart, unsigned long sig,
 		ret = setup_frame(sig, ka, oldset, regs);
 
 	if (ret == 0) {
-		spin_lock_irq(&current->sighand->siglock);
-		sigorsets(&current->blocked, &current->blocked,
-			&ka->sa.sa_mask);
+		sigset_t blocked;
+
+		sigorsets(&blocked, &current->blocked, &ka->sa.sa_mask);
 		if (!(ka->sa.sa_flags & SA_NODEFER))
-			sigaddset(&current->blocked, sig);
-		recalc_sigpending();
-		spin_unlock_irq(&current->sighand->siglock);
+			sigaddset(&blocked, sig);
+		set_current_blocked(&blocked);
 	}
 	return ret;
 }
diff --git a/arch/cris/arch-v32/kernel/signal.c b/arch/cris/arch-v32/kernel/signal.c
index ce4ab1a..e493656 100644
--- a/arch/cris/arch-v32/kernel/signal.c
+++ b/arch/cris/arch-v32/kernel/signal.c
@@ -62,12 +62,14 @@ int
 sys_sigsuspend(old_sigset_t mask, long r11, long r12, long r13, long mof,
 	       long srp, struct pt_regs *regs)
 {
-	mask &= _BLOCKABLE;
-	spin_lock_irq(&current->sighand->siglock);
+	sigset_t blocked;
+
 	current->saved_sigmask = current->blocked;
-	siginitset(&current->blocked, mask);
-	recalc_sigpending();
-	spin_unlock_irq(&current->sighand->siglock);
+
+	mask &= _BLOCKABLE;
+	siginitset(&blocked, mask);
+	set_current_blocked(&blocked);
+
 	current->state = TASK_INTERRUPTIBLE;
 	schedule();
 	set_thread_flag(TIF_RESTORE_SIGMASK);
@@ -176,12 +178,7 @@ sys_sigreturn(long r10, long r11, long r12, long r13, long mof, long srp,
 		goto badframe;
 
 	sigdelsetmask(&set, ~_BLOCKABLE);
-	spin_lock_irq(&current->sighand->siglock);
-
-	current->blocked = set;
-
-	recalc_sigpending();
-	spin_unlock_irq(&current->sighand->siglock);
+	set_current_blocked(&set);
 
 	if (restore_sigcontext(regs, &frame->sc))
 		goto badframe;
@@ -222,12 +219,7 @@ sys_rt_sigreturn(long r10, long r11, long r12, long r13, long mof, long srp,
 		goto badframe;
 
 	sigdelsetmask(&set, ~_BLOCKABLE);
-	spin_lock_irq(&current->sighand->siglock);
-
-	current->blocked = set;
-
-	recalc_sigpending();
-	spin_unlock_irq(&current->sighand->siglock);
+	set_current_blocked(&set);
 
 	if (restore_sigcontext(regs, &frame->uc.uc_mcontext))
 		goto badframe;
@@ -516,13 +508,12 @@ handle_signal(int canrestart, unsigned long sig,
 		ka->sa.sa_handler = SIG_DFL;
 
 	if (ret == 0) {
-		spin_lock_irq(&current->sighand->siglock);
-		sigorsets(&current->blocked, &current->blocked,
-			&ka->sa.sa_mask);
+		sigset_t blocked;
+
+		sigorsets(&blocked, &current->blocked, &ka->sa.sa_mask);
 		if (!(ka->sa.sa_flags & SA_NODEFER))
-			sigaddset(&current->blocked, sig);
-		recalc_sigpending();
-		spin_unlock_irq(&current->sighand->siglock);
+			sigaddset(&blocked, sig);
+		set_current_blocked(&blocked);
 	}
 
 	return ret;
-- 
1.7.4.4


  parent reply	other threads:[~2011-08-11 13:57 UTC|newest]

Thread overview: 87+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-11 13:56 [PATCH 00/41] signal: Use set_current_blocked() Matt Fleming
2011-08-11 13:56 ` [PATCH 01/41] alpha: " Matt Fleming
2011-08-11 13:56 ` [PATCH 02/41] arm: " Matt Fleming
2011-08-11 17:04   ` Will Deacon
2011-08-11 13:56 ` [PATCH 03/41] avr32: Don't mask signals in the error path Matt Fleming
2011-08-11 13:56 ` [PATCH 04/41] avr32: use set_current_blocked() in handle_signal/sys_rt_sigreturn Matt Fleming
2011-08-11 13:56 ` [PATCH 05/41] blackfin: Use set_current_blocked() Matt Fleming
2011-08-11 13:56 ` Matt Fleming [this message]
2011-08-11 13:56 ` [PATCH 07/41] frv: " Matt Fleming
2011-08-11 13:56 ` [PATCH 08/41] h8300: " Matt Fleming
2011-08-11 13:56 ` [PATCH 09/41] ia64: " Matt Fleming
2011-08-11 13:56 ` [PATCH 10/41] m32r: " Matt Fleming
2011-08-11 13:56 ` [PATCH 11/41] m68k: " Matt Fleming
2011-08-11 13:56 ` [PATCH 12/41] microblaze: Don't reimplement force_sigsegv() Matt Fleming
2011-08-16 17:20   ` Oleg Nesterov
2011-08-16 17:20     ` Oleg Nesterov
2011-08-17 13:01       ` Michal Simek
2011-08-17 13:14         ` Oleg Nesterov
2011-08-17 13:25           ` Matt Fleming
2011-08-17 13:17         ` Matt Fleming
2011-08-17 13:22           ` Michal Simek
2011-08-11 13:56 ` [PATCH 13/41] microblaze: No need to reset handler if SA_ONESHOT Matt Fleming
2011-08-11 13:56 ` [PATCH 14/41] microblaze: Fix signal masking Matt Fleming
2011-08-11 13:56 ` [PATCH 15/41] microblaze: Use set_current_blocked() Matt Fleming
2011-08-11 13:56 ` [PATCH 16/41] MIPS: " Matt Fleming
2011-08-11 13:56 ` [PATCH 17/41] mn10300: " Matt Fleming
2011-08-11 13:56 ` [PATCH 18/41] OpenRISC: Don't reimplement force_sigsegv() Matt Fleming
2011-08-16 16:49   ` Oleg Nesterov
2011-08-16 19:33     ` Matt Fleming
2011-08-18 17:47       ` Oleg Nesterov
2011-08-11 13:56 ` [PATCH 19/41] OpenRISC: No need to reset handler if SA_ONESHOT Matt Fleming
2011-08-16 16:53   ` Oleg Nesterov
2011-08-11 13:56 ` [PATCH 20/41] OpenRISC: Don't mask signals if we fail to setup signal stack Matt Fleming
2011-08-11 13:56 ` [PATCH 21/41] OpenRISC: Use set_current_blocked() Matt Fleming
2011-08-11 13:56 ` [PATCH 22/41] parisc: " Matt Fleming
2011-08-11 13:56 ` [PATCH 23/41] powerpc: " Matt Fleming
2011-08-11 13:56 ` [PATCH 24/41] score: Don't mask signals if we fail to setup signal stack Matt Fleming
2011-08-11 13:56 ` [PATCH 25/41] score: Use set_current_blocked() Matt Fleming
2011-08-11 13:57 ` [PATCH 26/41] sh: No need to reset handler if SA_ONESHOT Matt Fleming
2011-08-16 17:25   ` Oleg Nesterov
2011-08-11 13:57 ` [PATCH 27/41] sh: Use set_current_blocked() Matt Fleming
2011-08-11 13:57 ` [PATCH 28/41] sparc: " Matt Fleming
2011-08-11 13:57 ` [PATCH 29/41] tile: " Matt Fleming
2011-08-11 17:10   ` Chris Metcalf
2011-08-11 13:57 ` [PATCH 30/41] um: " Matt Fleming
2011-08-11 13:57 ` [PATCH 31/41] um: Don't restore current->blocked on error Matt Fleming
2011-08-16 17:38   ` Oleg Nesterov
2011-08-11 13:57 ` [PATCH 32/41] unicore32: Use set_current_blocked() Matt Fleming
2011-08-18  8:34   ` Guan Xuetao
2011-08-11 13:57 ` [PATCH 33/41] xtensa: Don't reimplement force_sigsegv() Matt Fleming
2011-08-16 17:40   ` Oleg Nesterov
2011-08-11 13:57 ` [PATCH 34/41] xtensa: No need to reset handler if SA_ONESHOT Matt Fleming
2011-08-11 13:57 ` [PATCH 35/41] xtensa: Don't mask signals if we fail to setup signal stack Matt Fleming
2011-08-11 13:57 ` [PATCH 36/41] xtensa: Use set_current_blocked() Matt Fleming
2011-08-11 13:57 ` [PATCH 37/41] autofs4: " Matt Fleming
2011-08-16 17:47   ` Oleg Nesterov
2011-08-16 20:29     ` Matt Fleming
2011-08-11 13:57 ` [PATCH 38/41] coda: " Matt Fleming
2011-08-11 13:57 ` [PATCH 39/41] dlm: Remove another superfluous call to recalc_sigpending() Matt Fleming
2011-08-11 15:39   ` David Teigland
2011-08-16 19:36   ` Oleg Nesterov
2011-08-11 13:57 ` [PATCH 40/41] ncpfs: Use set_current_blocked() Matt Fleming
2011-08-16 17:56   ` Oleg Nesterov
2011-08-16 20:56     ` Matt Fleming
2011-08-17 12:04       ` Oleg Nesterov
2011-08-17 13:58         ` Matt Fleming
2011-08-17 14:41           ` Oleg Nesterov
     [not found]             ` <CA+i2_De=mKMHj++b5=ZPdXxp7pm2KzY+PzCaG++GWSud20a_qQ@mail.gmail.com>
2011-08-18 17:05               ` Oleg Nesterov
2011-08-18 20:09                 ` Matt Fleming
2011-08-11 13:57 ` [PATCH 41/41] exit: Use __set_task_blocked() Matt Fleming
2011-08-16 18:06   ` Oleg Nesterov
2011-08-16 19:44     ` [PATCH 0/1] kthreads: allow_signal: don't play with ->blocked Oleg Nesterov
2011-08-16 19:44       ` [PATCH 1/1] " Oleg Nesterov
2011-08-16 19:51         ` Tejun Heo
2011-08-16 20:07           ` Oleg Nesterov
2011-08-16 21:50           ` Matt Fleming
2011-08-17  7:27             ` Tejun Heo
2011-08-17  9:56               ` Matt Fleming
2011-08-17 18:26               ` Oleg Nesterov
2011-08-16 21:51     ` [PATCH 41/41] exit: Use __set_task_blocked() Matt Fleming
2011-08-11 16:03 ` [PATCH 00/41] signal: Use set_current_blocked() Oleg Nesterov
2011-08-16 19:40   ` Matt Fleming
2011-08-17 17:01     ` Oleg Nesterov
2011-08-17 22:17       ` Matt Fleming
2011-08-18 11:09         ` Matt Fleming
2011-08-18 18:36           ` Oleg Nesterov
2011-08-16 19:58 ` Oleg Nesterov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1313071035-12047-7-git-send-email-matt@console-pimps.org \
    --to=matt@console-pimps.org \
    --cc=jesper.nilsson@axis.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=oleg@redhat.com \
    --cc=starvik@axis.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.