diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-10 15:17:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-10 15:17:24 -0700 |
| commit | 7c283324da366a3e6ffaad4352a51a3c71fcae17 (patch) | |
| tree | b4d02c340a17ac5134889c4eec7dcd06d407e3ca /kernel/fork.c | |
| parent | 9e5869f8d70d94850cf86163c57ba8d4daa29924 (diff) | |
| parent | 17ff3c1fa4c7bd0c38d751715033023ebf32fc96 (diff) | |
| download | op-kernel-dev-7c283324da366a3e6ffaad4352a51a3c71fcae17.zip op-kernel-dev-7c283324da366a3e6ffaad4352a51a3c71fcae17.tar.gz | |
Merge branch 'akpm' (Andrew's patch-bomb)
Merge misc fixes from Andrew Morton.
* emailed from Andrew Morton <akpm@linux-foundation.org>: (8 patches)
MAINTAINERS: add maintainer for LED subsystem
mm: nobootmem: fix sign extend problem in __free_pages_memory()
drivers/leds: correct __devexit annotations
memcg: free spare array to avoid memory leak
namespaces, pid_ns: fix leakage on fork() failure
hugetlb: prevent BUG_ON in hugetlb_fault() -> hugetlb_cow()
mm: fix division by 0 in percpu_pagelist_fraction()
proc/pid/pagemap: correctly report non-present ptes and holes between vmas
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 b9372a0..687a15d5 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) |
