Commit 87245135 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds
Browse files

allow_signal: kill the bogus ->mm check, add a note about CLONE_SIGHAND



allow_signal() checks ->mm == NULL.  Not sure why.  Perhaps to make sure
current is the kernel thread.  But this helper must not be used unless we
are the kernel thread, kill this check.

Also, document the fact that the CLONE_SIGHAND kthread must not use
allow_signal(), unless the caller really wants to change the parent's
->sighand->action as well.

Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Acked-by: default avatarRoland McGrath <roland@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2ffebca6
Loading
Loading
Loading
Loading
+9 −10
Original line number Original line Diff line number Diff line
@@ -375,9 +375,8 @@ static void set_special_pids(struct pid *pid)
}
}


/*
/*
 * Let kernel threads use this to say that they
 * Let kernel threads use this to say that they allow a certain signal.
 * allow a certain signal (since daemonize() will
 * Must not be used if kthread was cloned with CLONE_SIGHAND.
 * have disabled all of them by default).
 */
 */
int allow_signal(int sig)
int allow_signal(int sig)
{
{
@@ -385,14 +384,14 @@ int allow_signal(int sig)
		return -EINVAL;
		return -EINVAL;


	spin_lock_irq(&current->sighand->siglock);
	spin_lock_irq(&current->sighand->siglock);
	/* This is only needed for daemonize()'ed kthreads */
	sigdelset(&current->blocked, sig);
	sigdelset(&current->blocked, sig);
	if (!current->mm) {
	/*
		/* Kernel threads handle their own signals.
	 * Kernel threads handle their own signals. Let the signal code
		   Let the signal code know it'll be handled, so
	 * know it'll be handled, so that they don't get converted to
		   that they don't get converted to SIGKILL or
	 * SIGKILL or just silently dropped.
		   just silently dropped */
	 */
	current->sighand->action[(sig)-1].sa.sa_handler = (void __user *)2;
	current->sighand->action[(sig)-1].sa.sa_handler = (void __user *)2;
	}
	recalc_sigpending();
	recalc_sigpending();
	spin_unlock_irq(&current->sighand->siglock);
	spin_unlock_irq(&current->sighand->siglock);
	return 0;
	return 0;