---

yaml --- r: 187258 b: refs/heads/master c: 13aa9a6 h: refs/heads/master v: v3
git-mirror · Mar 12, 2010 · 2327331 · 2327331
1 parent fb6f37a
commit 2327331
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6edb6764409392836b44a61b06d94954efd6200f
+refs/heads/master: 13aa9a6b0f2371d2ce0de57c2ede62ab7a787157
diff --git a/trunk/kernel/pid_namespace.c b/trunk/kernel/pid_namespace.c
@@ -161,13 +161,12 @@ void zap_pid_ns_processes(struct pid_namespace *pid_ns)
 		rcu_read_lock();
 
 		/*
-		 * Use force_sig() since it clears SIGNAL_UNKILLABLE ensuring
-		 * any nested-container's init processes don't ignore the
-		 * signal
+		 * Any nested-container's init processes won't ignore the
+		 * SEND_SIG_NOINFO signal, see send_signal()->si_fromuser().
 		 */
 		task = pid_task(find_vpid(nr), PIDTYPE_PID);
 		if (task)
-			force_sig(SIGKILL, task);
+			send_sig_info(SIGKILL, SEND_SIG_NOINFO, task);
 
 		rcu_read_unlock();