---

yaml --- r: 139685 b: refs/heads/master c: b3bfa0c h: refs/heads/master i: 139683: 3c8813d v: v3
git-mirror · Apr 3, 2009 · de14485 · de14485
1 parent 9a794e4
commit de14485
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4da026f980df125a4918c3bb9fe93185c7ef12a
+refs/heads/master: b3bfa0cba867f23365b81658b47efd906830879b
diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c
@@ -841,6 +841,8 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)
 	atomic_set(&sig->live, 1);
 	init_waitqueue_head(&sig->wait_chldexit);
 	sig->flags = 0;
+	if (clone_flags & CLONE_NEWPID)
+		sig->flags |= SIGNAL_UNKILLABLE;
 	sig->group_exit_code = 0;
 	sig->group_exit_task = NULL;
 	sig->group_stop_count = 0;

diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c
@@ -1870,9 +1870,16 @@ int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka,
 
 		/*
 		 * Global init gets no signals it doesn't want.
+		 * Container-init gets no signals it doesn't want from same
+		 * container.
+		 *
+		 * Note that if global/container-init sees a sig_kernel_only()
+		 * signal here, the signal must have been generated internally
+		 * or must have come from an ancestor namespace. In either
+		 * case, the signal cannot be dropped.
 		 */
 		if (unlikely(signal->flags & SIGNAL_UNKILLABLE) &&
-		    !signal_group_exit(signal))
+				!sig_kernel_only(signr))
 			continue;
 
 		if (sig_kernel_stop(signr)) {