Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49209590 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Al Viro
Browse files

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().

Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Acked-by: default avatarHavard Skinnemoen <hskinnemoen@gmail.com>
Reviewed-by: default avatarMatt Fleming <matt.fleming@intel.com>
Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent e1b1fd79

arch/avr32/kernel/signal.c

+5 −10
Original line number Diff line number Diff line
@@ -87,10 +87,7 @@ asmlinkage int sys_rt_sigreturn(struct pt_regs *regs) 
		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 k_sigaction *ka, siginfo_t *info, 
	/*

	 * 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);

}



/*