diff options
| author | Oleg Nesterov | 2014-12-11 00:55:25 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2014-12-11 02:41:18 +0100 |
| commit | 24c037ebf5723d4d9ab0996433cee4f96c292a4d (patch) | |
| tree | 9317b4c2d079b02610b3578d2b8e5f3b365fb93d /kernel/pid.c | |
| parent | exit: exit_notify: re-use "dead" list to autoreap current (diff) | |
| download | kernel-qcow2-linux-24c037ebf5723d4d9ab0996433cee4f96c292a4d.tar.gz kernel-qcow2-linux-24c037ebf5723d4d9ab0996433cee4f96c292a4d.tar.xz kernel-qcow2-linux-24c037ebf5723d4d9ab0996433cee4f96c292a4d.zip | |
exit: pidns: alloc_pid() leaks pid_namespace if child_reaper is exiting
alloc_pid() does get_pid_ns() beforehand but forgets to put_pid_ns() if it
fails because disable_pid_allocation() was called by the exiting
child_reaper.
We could simply move get_pid_ns() down to successful return, but this fix
tries to be as trivial as possible.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Reviewed-by: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Aaron Tomlin <atomlin@redhat.com>
Cc: Pavel Emelyanov <xemul@parallels.com>
Cc: Serge Hallyn <serge.hallyn@ubuntu.com>
Cc: Sterling Alexander <stalexan@redhat.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/pid.c')
| -rw-r--r-- | kernel/pid.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/pid.c b/kernel/pid.c index 9b9a26698144..82430c858d69 100644 --- a/kernel/pid.c +++ b/kernel/pid.c @@ -341,6 +341,8 @@ out: out_unlock: spin_unlock_irq(&pidmap_lock); + put_pid_ns(ns); + out_free: while (++i <= ns->level) free_pidmap(pid->numbers + i); |