Commit e1b1fd79 authored May 11, 2012 by Matt Fleming Committed by Al Viro May 21, 2012

avr32: don't mask signals in the error path



The current handle_signal() implementation is broken - it will mask
signals if we fail to setup the signal stack frame, which isn't the
desired behaviour, we should only be masking signals if we succeed in
setting up the stack frame.  It looks like this code was copied from the
old (broken) arm implementation but wasn't updated when the arm code was
fixed in commit a6c61e9d ("[ARM] 3168/1: Update ARM signal delivery
and masking").

Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Acked-by: Havard Skinnemoen <hskinnemoen@gmail.com>
Acked-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

parent 3883e301

arch/avr32/kernel/signal.c

+12 −13

Original line number	Diff line number	Diff line
		@@ -238,24 +238,23 @@ handle_signal(unsigned long sig, struct k_sigaction ka, siginfo_t info,
		*/
		ret \|= !valid_user_regs(regs);

		if (ret != 0) {
		force_sigsegv(sig, current);
		return;
		}

		/*
		* Block the signal if we were unsuccessful.
		* Block the signal if we were successful.
		*/
		if (ret != 0 \|\| !(ka->sa.sa_flags & SA_NODEFER)) {
		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);
		}

		if (ret == 0)
		return;

		force_sigsegv(sig, current);
		}

		/*
		* Note that 'init' is a special process: it doesn't get signals it
		* doesn't want to handle. Thus you cannot kill init even with a

Admin message