From 5d124e99c2fee1c8f3020ecb0dff8d5617ee7991 Mon Sep 17 00:00:00 2001 From: Pavel Date: Mon, 2 Oct 2006 02:18:24 -0700 Subject: [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 Acked-by: Serge Hallyn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- kernel/nsproxy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c index 8d6c852..6ebdb82 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; } -- cgit v1.1