diff options
| author |   H. Peter Anvin <hpa@zytor.com> | 2012-05-21 12:17:50 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-05-21 12:17:50 -0700 |
| commit | d13a822e6d08733cc69dd8c2f5d82eacb1474295 (patch) | |
| tree | 2b39613c0d8cce9eb3b15adb1525a2c72f46d392 /kernel/fork.c | |
| parent | x86, printk: Add missing KERN_CONT to NMI selftest (diff) | |
| parent | Linux 3.4 (diff) | |
| download | wireguard-linux-d13a822e6d08733cc69dd8c2f5d82eacb1474295.tar.xz wireguard-linux-d13a822e6d08733cc69dd8c2f5d82eacb1474295.zip | |
Merge commit 'v3.4' into x86/urgent
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 b9372a0bff18..687a15d56243 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> @@ -1464,6 +1465,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) |