diff options
Diffstat (limited to 'kernel/pid_namespace.c')
-rw-r--r-- | kernel/pid_namespace.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c index 86b3796b0436..a5aff94e1f0b 100644 --- a/kernel/pid_namespace.c +++ b/kernel/pid_namespace.c | |||
@@ -13,6 +13,7 @@ | |||
13 | #include <linux/syscalls.h> | 13 | #include <linux/syscalls.h> |
14 | #include <linux/err.h> | 14 | #include <linux/err.h> |
15 | #include <linux/acct.h> | 15 | #include <linux/acct.h> |
16 | #include <linux/slab.h> | ||
16 | 17 | ||
17 | #define BITS_PER_PAGE (PAGE_SIZE*8) | 18 | #define BITS_PER_PAGE (PAGE_SIZE*8) |
18 | 19 | ||
@@ -161,13 +162,12 @@ void zap_pid_ns_processes(struct pid_namespace *pid_ns) | |||
161 | rcu_read_lock(); | 162 | rcu_read_lock(); |
162 | 163 | ||
163 | /* | 164 | /* |
164 | * Use force_sig() since it clears SIGNAL_UNKILLABLE ensuring | 165 | * Any nested-container's init processes won't ignore the |
165 | * any nested-container's init processes don't ignore the | 166 | * SEND_SIG_NOINFO signal, see send_signal()->si_fromuser(). |
166 | * signal | ||
167 | */ | 167 | */ |
168 | task = pid_task(find_vpid(nr), PIDTYPE_PID); | 168 | task = pid_task(find_vpid(nr), PIDTYPE_PID); |
169 | if (task) | 169 | if (task) |
170 | force_sig(SIGKILL, task); | 170 | send_sig_info(SIGKILL, SEND_SIG_NOINFO, task); |
171 | 171 | ||
172 | rcu_read_unlock(); | 172 | rcu_read_unlock(); |
173 | 173 | ||