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 #include #include +#include #include #include #include @@ -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)