diff options
| author | Colin Cross <ccross@android.com> | 2012-05-14 16:41:02 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2012-05-14 16:41:02 -0700 |
| commit | ec0b571c19ac62ab0bb80d373a3d4922a48b4b75 (patch) | |
| tree | 10c597f5227c969c3f2b909fbeb29725a0c5c6e8 /kernel/fork.c | |
| parent | 7bb8b65407a519d3a90dd8cecdd1ccd10ee0c6cc (diff) | |
| parent | 36be50515fe2aef61533b516fa2576a2c7fe7664 (diff) | |
Merge commit 'v3.4-rc7' into android-3.4
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index cafb9bebb6a..c0bf8c7002a 100644 --- a/kernel/fork.c +++ b/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> @@ -1481,6 +1482,8 @@ bad_fork_cleanup_io: 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) |