From e20775e235760823a8e606871d9af051404e15b2 Mon Sep 17 00:00:00 2001
From: Mike Galbraith <efault@gmx.de>
Date: Thu, 10 May 2012 13:01:45 -0700
Subject: [PATCH] --- yaml --- r: 300154 b: refs/heads/master c:
 5e2bf0142231194d36fdc9596b36a261ed2b9fe7 h: refs/heads/master v: v3

---
 [refs]              | 2 +-
 trunk/kernel/fork.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9bc990c6f223..4614d46ee3d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4998a6c0edce7fae9c0a5463f6ec3fa585258ee7
+refs/heads/master: 5e2bf0142231194d36fdc9596b36a261ed2b9fe7
diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c
index b9372a0bff18..687a15d56243 100644
--- a/trunk/kernel/fork.c
+++ b/trunk/kernel/fork.c
@@ -47,6 +47,7 @@
 #include <linux/audit.h>
 #include <linux/memcontrol.h>
 #include <linux/ftrace.h>
+#include <linux/proc_fs.h>
 #include <linux/profile.h>
 #include <linux/rmap.h>
 #include <linux/ksm.h>
@@ -1464,6 +1465,8 @@ static struct task_struct *copy_process(unsigned long clone_flags,
 	if (p->io_context)
 		exit_io_context(p);
 bad_fork_cleanup_namespaces:
+	if (unlikely(clone_flags & CLONE_NEWPID))
+		pid_ns_release_proc(p->nsproxy->pid_ns);
 	exit_task_namespaces(p);
 bad_fork_cleanup_mm:
 	if (p->mm)