Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / kernel / nsproxy.c

diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index 8d6c852dc51ea76ffaf023f7452ced9794ffc5f4..6ebdb82a0ce43a5211e3862008959cb5091febcd 100644 (file)
--- 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;
 }