Commit 13fbcb73 authored Oct 16, 2007 by Oleg Nesterov Committed by Linus Torvalds Oct 17, 2007

do_sigaction: don't worry about signal_pending()



do_sigaction() returns -ERESTARTNOINTR if signal_pending(). The comment says:

	* If there might be a fatal signal pending on multiple
	* threads, make sure we take it before changing the action.

I think this is not needed. We should only worry about SIGNAL_GROUP_EXIT case,
bit it implies a pending SIGKILL which can't be cleared by do_sigaction.

Kill this special case.

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Acked-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 6db840fa

kernel/signal.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -2294,15 +2294,6 @@ int do_sigaction(int sig, struct k_sigaction act, struct k_sigaction oact)
		k = &current->sighand->action[sig-1];

		spin_lock_irq(&current->sighand->siglock);
		if (signal_pending(current)) {
		/*
		* If there might be a fatal signal pending on multiple
		* threads, make sure we take it before changing the action.
		*/
		spin_unlock_irq(&current->sighand->siglock);
		return -ERESTARTNOINTR;
		}

		if (oact)
		oact = k;