[PATCH 3.13.y-ckt 104/139] exit: pidns: alloc_pid() leaks pid_namespace if child_reaper is exiting
Kamal Mostafa
kamal at canonical.com
Wed Jan 28 22:20:47 UTC 2015
3.13.11-ckt15 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleg Nesterov <oleg at redhat.com>
commit 24c037ebf5723d4d9ab0996433cee4f96c292a4d upstream.
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 at redhat.com>
Reviewed-by: "Eric W. Biederman" <ebiederm at xmission.com>
Cc: Aaron Tomlin <atomlin at redhat.com>
Cc: Pavel Emelyanov <xemul at parallels.com>
Cc: Serge Hallyn <serge.hallyn at ubuntu.com>
Cc: Sterling Alexander <stalexan at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
kernel/pid.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/kernel/pid.c b/kernel/pid.c
index 9b9a266..82430c8 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);
--
1.9.1
More information about the kernel-team
mailing list