[PATCH 14/40] m68k: Use set_current_blocked() and block_sigmask()

From: Matt Fleming <hidden>
Date: 2012-02-14 11:42:38
Also in: lkml
Reply to: Matt Fleming, 2012-02-14

From: Matt Fleming <redacted>

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.

Also, use the new helper function introduced in commit 5e6292c0f28f
("signal: add block_sigmask() for adding sigmask to current->blocked")
which centralises the code for updating current->blocked after
successfully delivering a signal and reduces the amount of duplicate
code across architectures. In the past some architectures got this
code wrong, so using this helper function should stop that from
happening again.

Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Greg Ungerer <redacted>
CC: <redacted>
Signed-off-by: Matt Fleming <redacted>
---
 arch/m68k/kernel/signal_mm.c |   22 +++++++++-------------
 arch/m68k/kernel/signal_no.c |   28 +++++++++-------------------
 2 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/arch/m68k/kernel/signal_mm.c b/arch/m68k/kernel/signal_mm.c
index cb856f9..93208b8 100644
--- a/arch/m68k/kernel/signal_mm.c
+++ b/arch/m68k/kernel/signal_mm.c

@@ -105,12 +105,13 @@ int handle_kernel_fault(struct pt_regs *regs)
 asmlinkage int
 sys_sigsuspend(int unused0, int unused1, old_sigset_t mask)
 {
-	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();

@@ -528,8 +529,7 @@ asmlinkage int do_sigreturn(unsigned long __unused)
 		goto badframe;
 
 	sigdelsetmask(&set, ~_BLOCKABLE);
-	current->blocked = set;
-	recalc_sigpending();
+	set_current_blocked(&set);
 
 	if (restore_sigcontext(regs, &frame->sc, frame + 1))
 		goto badframe;

@@ -554,8 +554,7 @@ asmlinkage int do_rt_sigreturn(unsigned long __unused)
 		goto badframe;
 
 	sigdelsetmask(&set, ~_BLOCKABLE);
-	current->blocked = set;
-	recalc_sigpending();
+	set_current_blocked(&set);
 
 	if (rt_restore_ucontext(regs, sw, &frame->uc))
 		goto badframe;

@@ -1063,10 +1062,7 @@ handle_signal(int sig, struct k_sigaction *ka, siginfo_t *info,
 	if (err)
 		return;
 
-	sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
-	if (!(ka->sa.sa_flags & SA_NODEFER))
-		sigaddset(&current->blocked,sig);
-	recalc_sigpending();
+	block_sigmask(ka, sig);
 
 	if (test_thread_flag(TIF_DELAYED_TRACE)) {
 		regs->sr &= ~0x8000;

diff --git a/arch/m68k/kernel/signal_no.c b/arch/m68k/kernel/signal_no.c
index 36a81bb..33e8bf5 100644
--- a/arch/m68k/kernel/signal_no.c
+++ b/arch/m68k/kernel/signal_no.c

@@ -60,12 +60,13 @@ void ret_from_user_rt_signal(void);
 asmlinkage int
 sys_sigsuspend(int unused0, int unused1, old_sigset_t mask)
 {
-	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();

@@ -343,10 +344,7 @@ asmlinkage int do_sigreturn(unsigned long __unused)
 		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, frame + 1, &d0))
 		goto badframe;

@@ -372,10 +370,7 @@ asmlinkage int do_rt_sigreturn(unsigned long __unused)
 		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 (rt_restore_ucontext(regs, sw, &frame->uc, &d0))
 		goto badframe;

@@ -708,12 +703,7 @@ handle_signal(int sig, struct k_sigaction *ka, siginfo_t *info,
 	if (err)
 		return;
 
-	spin_lock_irq(&current->sighand->siglock);
-	sigorsets(&current->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);
+	block_sigmask(ka, sig);
 
 	clear_thread_flag(TIF_RESTORE_SIGMASK);
 }

-- 
1.7.4.4

Matt Fleming · 2012-02-14
[PATCH 02/40] arm: Use set_current_blocked() and block_sigmask() · Matt Fleming · 2012-02-14
[PATCH 01/40] alpha: Use set_current_blocked() and block_sigmask() · Matt Fleming · 2012-02-14
[PATCH 03/40] avr32: Don't mask signals in the error path · Matt Fleming · 2012-02-14
[PATCH 04/40] avr32: use set_current_blocked() in handle_signal/sys_rt_sigreturn · Matt Fleming · 2012-02-14
[PATCH 05/40] avr32: Use block_sigmask() · Matt Fleming · 2012-02-14
[PATCH 06/40] blackfin: Use set_current_blocked() and block_sigmask() · Matt Fleming · 2012-02-14
Re: [PATCH 06/40] blackfin: Use set_current_blocked() and block_sigmask() · Bob Liu · 2012-02-16
[PATCH 07/40] C6X: Use set_current_blocked() and block_sigmask() · Matt Fleming · 2012-02-14
[PATCH 09/40] frv: Use set_current_blocked() and block_sigmask() · Matt Fleming · 2012-02-14
[PATCH 10/40] h8300: Use set_current_blocked() and block_sigmask() · Matt Fleming · 2012-02-14
[PATCH 13/40] m32r: Use set_current_blocked() and block_sigmask() · Matt Fleming · 2012-02-14
[PATCH 14/40] m68k: Use set_current_blocked() and block_sigmask() · Matt Fleming · 2012-02-14
[PATCH 15/40] microblaze: Don't reimplement force_sigsegv() · Matt Fleming · 2012-02-14
[PATCH 17/40] microblaze: Fix signal masking · Matt Fleming · 2012-02-14
[PATCH 19/40] MIPS: Use set_current_blocked() and block_sigmask() · Matt Fleming · 2012-02-14
[PATCH 20/40] mn10300: Use set_current_blocked() and block_sigmask() · Matt Fleming · 2012-02-14
Re: [PATCH 20/40] mn10300: Use set_current_blocked() and block_sigmask() · David Howells · 2012-02-14
Re: [PATCH 20/40] mn10300: Use set_current_blocked() and block_sigmask() · Oleg Nesterov · 2012-02-14
Re: [PATCH 20/40] mn10300: Use set_current_blocked() and block_sigmask() · David Howells · 2012-02-14
Re: [PATCH 20/40] mn10300: Use set_current_blocked() and block_sigmask() · Oleg Nesterov · 2012-02-14
Re: [PATCH 20/40] mn10300: Use set_current_blocked() and block_sigmask() · Matt Fleming · 2012-02-14
Re: [PATCH 20/40] mn10300: Use set_current_blocked() and block_sigmask() · David Howells · 2012-02-14
Re: [PATCH 20/40] mn10300: Use set_current_blocked() and block_sigmask() · Matt Fleming · 2012-02-15
[PATCH 21/40] OpenRISC: Don't reimplement force_sigsegv() · Matt Fleming · 2012-02-14
Re: [PATCH 21/40] OpenRISC: Don't reimplement force_sigsegv() · Jonas Bonn · 2012-02-15
Re: [PATCH 21/40] OpenRISC: Don't reimplement force_sigsegv() · Matt Fleming · 2012-02-15
Re: [PATCH 21/40] OpenRISC: Don't reimplement force_sigsegv() · Jonas Bonn · 2012-02-15
[PATCH 22/40] OpenRISC: No need to reset handler if SA_ONESHOT · Matt Fleming · 2012-02-14
[PATCH 26/40] powerpc: Use set_current_blocked() and block_sigmask() · Matt Fleming · 2012-02-14
[PATCH 25/40] parisc: Use set_current_blocked() and block_sigmask() · Matt Fleming · 2012-02-14
Re: [PATCH 25/40] parisc: Use set_current_blocked() and block_sigmask() · Kyle McMartin · 2012-04-06
[PATCH 28/40] score: Don't mask signals if we fail to setup signal stack · Matt Fleming · 2012-02-14
[PATCH 29/40] score: Use set_current_blocked() and block_sigmask() · Matt Fleming · 2012-02-14
[PATCH 32/40] sparc: Use block_sigmask() · Matt Fleming · 2012-02-14
Re: [PATCH 32/40] sparc: Use block_sigmask() · David Miller · 2012-02-15
[PATCH 37/40] xtensa: Don't reimplement force_sigsegv() · Matt Fleming · 2012-02-14
[PATCH 36/40] unicore32: Use block_sigmask() · Matt Fleming · 2012-02-14
[PATCH 40/40] xtensa: Use set_current_blocked() and block_sigmask() · Matt Fleming · 2012-02-14
[PATCH 39/40] xtensa: Don't mask signals if we fail to setup signal stack · Matt Fleming · 2012-02-14
[PATCH 38/40] xtensa: No need to reset handler if SA_ONESHOT · Matt Fleming · 2012-02-14
[PATCH 35/40] um: Use set_current_blocked() and block_sigmask() · Matt Fleming · 2012-02-14
[PATCH 34/40] um: Don't restore current->blocked on error · Matt Fleming · 2012-02-14
[PATCH 33/40] tile: Use set_current_blocked() and block_sigmask() · Matt Fleming · 2012-02-14
[PATCH 31/40] sh: Use set_current_blocked() and block_sigmask() · Matt Fleming · 2012-02-14
[PATCH 30/40] sh: No need to reset handler if SA_ONESHOT · Matt Fleming · 2012-02-14
[PATCH 27/40] [S390] Use block_sigmask() · Matt Fleming · 2012-02-14
[PATCH 24/40] OpenRISC: Use set_current_blocked() and block_sigmask() · Matt Fleming · 2012-02-14
[PATCH 23/40] OpenRISC: Don't mask signals if we fail to setup signal stack · Matt Fleming · 2012-02-14
[PATCH 18/40] microblaze: Use set_current_blocked() and block_sigmask() · Matt Fleming · 2012-02-14
[PATCH 16/40] microblaze: No need to reset handler if SA_ONESHOT · Matt Fleming · 2012-02-14
[PATCH 12/40] ia64: Use set_current_blocked() and block_sigmask() · Matt Fleming · 2012-02-14
[PATCH 11/40] Hexagon: Use set_current_blocked() and block_sigmask() · Matt Fleming · 2012-02-14
[PATCH 08/40] cris: Use set_current_blocked() and block_sigmask() · Matt Fleming · 2012-02-14
Re: [PATCH 08/40] cris: Use set_current_blocked() and block_sigmask() · Jesper Nilsson · 2012-02-15
Mark Salter · 2012-02-14
Matt Fleming · 2012-02-14
Mark Salter · 2012-02-14
Matt Fleming · 2012-02-14
Oleg Nesterov · 2012-02-14
Matt Fleming · 2012-02-15
View all 61 messages

`h`	back out one level
`j`	next message in thread / next series-diff position
`k`	previous message in thread / previous series-diff position
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help