summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel <xemul@openvz.org>2006-10-02 02:18:24 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-02 07:57:22 -0700
commit5d124e99c2fee1c8f3020ecb0dff8d5617ee7991 (patch)
tree63a0226278175a8d30d7ff5803421cafea2b2813
parentfcfbd547b1209aae9d880fe5db33464413925cc8 (diff)
downloadlinux-5d124e99c2fee1c8f3020ecb0dff8d5617ee7991.tar.gz
linux-5d124e99c2fee1c8f3020ecb0dff8d5617ee7991.tar.bz2
linux-5d124e99c2fee1c8f3020ecb0dff8d5617ee7991.zip
[PATCH] nsproxy cloning error path fix
This patch fixes copy_namespaces()'s error path. when new nsproxy (new_ns) is created pointers to namespaces (ipc, uts) are copied from the old nsproxy. Later in copy_utsname, copy_ipcs, etc. according namespaces are get-ed. On error path needed namespaces are put-ed, so there's no need to put new nsproxy itelf as it woud cause putting namespaces for the second time. Found when incorporating namespaces into OpenVZ kernel. Signed-off-by: Pavel Emelianov <xemul@openvz.org> Acked-by: Serge Hallyn <serue@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--kernel/nsproxy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index 8d6c852dc51e..6ebdb82a0ce4 100644
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -123,7 +123,7 @@ out_uts:
put_namespace(new_ns->namespace);
out_ns:
tsk->nsproxy = old_ns;
- put_nsproxy(new_ns);
+ kfree(new_ns);
goto out;
}