[PATCH] avr32: use set_current_blocked() inhandle_signal/sys_rt_sigreturn

[Oleg Nesterov]

On 08/03, Oleg Nesterov wrote:
>
> On 08/03, Matt Fleming wrote:
> >
> > 	 * Block the signal if we were unsuccessful.
> > 	 */
> > 	if (ret != 0 || !(ka->sa.sa_flags & SA_NODEFER)) {
> > 		spin_lock_irq(&current->sighand->siglock);
> > 		sigorsets(&current->blocked, &current->blocked,
> > 			  &ka->sa.sa_mask);
> > 		sigaddset(&current->blocked, sig);
> > 		recalc_sigpending();
> > 		spin_unlock_irq(&current->sighand->siglock);
> > 	}
>
> Agreed, this looks "obviously wrong". We should block the !SA_NODEFER
> signal it was delivered.

(I meant, it is was successfully delivered).

While at it, I'd also suggest another patch on top of Matt's.
Uncompiled/untested.

------------------------------------------------------------------------------
[PATCH] avr32: use set_current_blocked() in handle_signal/sys_rt_sigreturn

It is wrong to change ->blocked directly, see e6fa16ab.
Change  handle_signal() and sys_rt_sigreturn() to use
the right helper, set_current_blocked().

Signed-off-by: Oleg Nesterov <oleg@xxxxxxxxxx>

 signal.c |   15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

--- x/arch/avr32/kernel/signal.c
+++ x/arch/avr32/kernel/signal.c
@@ -87,10 +87,7 @@ asmlinkage int sys_rt_sigreturn(struct p
 		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;
@@ -226,6 +223,7 @@ static inline void
 handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
 	      sigset_t *oldset, struct pt_regs *regs, int syscall)
 {
+	sigset_t blocked;
 	int ret;
 
 	/*
@@ -246,13 +244,10 @@ handle_signal(unsigned long sig, struct 
 	/*
 	 * Block the signal if we were successful.
 	 */
-	spin_lock_irq(&current->sighand->siglock);
-	sigorsets(&current->blocked, &current->blocked,
-		  &ka->sa.sa_mask);
+	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);
 }
 
 /*

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/