diff options
Diffstat (limited to 'kernel/pid_namespace.c')
-rw-r--r-- | kernel/pid_namespace.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c index a8968396046d..17b232869a04 100644 --- a/kernel/pid_namespace.c +++ b/kernel/pid_namespace.c | |||
@@ -168,13 +168,9 @@ void zap_pid_ns_processes(struct pid_namespace *pid_ns) | |||
168 | while (nr > 0) { | 168 | while (nr > 0) { |
169 | rcu_read_lock(); | 169 | rcu_read_lock(); |
170 | 170 | ||
171 | /* | ||
172 | * Any nested-container's init processes won't ignore the | ||
173 | * SEND_SIG_NOINFO signal, see send_signal()->si_fromuser(). | ||
174 | */ | ||
175 | task = pid_task(find_vpid(nr), PIDTYPE_PID); | 171 | task = pid_task(find_vpid(nr), PIDTYPE_PID); |
176 | if (task) | 172 | if (task && !__fatal_signal_pending(task)) |
177 | send_sig_info(SIGKILL, SEND_SIG_NOINFO, task); | 173 | send_sig_info(SIGKILL, SEND_SIG_FORCED, task); |
178 | 174 | ||
179 | rcu_read_unlock(); | 175 | rcu_read_unlock(); |
180 | 176 | ||