From 8951fcf3de31c309b24cbde2c0c1c65ce0d75730 Mon Sep 17 00:00:00 2001 From: Cedric Le Goater Date: Sat, 23 Jun 2007 17:16:25 -0700 Subject: [PATCH] --- yaml --- r: 57978 b: refs/heads/master c: 4e71e474c784dc274f28ec8bb22a5dbabc6dc7c5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/nsproxy.c | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 69ff5ec79b9d..1ba6ca93540a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d79af701d334777541136e914a9c0969b2ad307 +refs/heads/master: 4e71e474c784dc274f28ec8bb22a5dbabc6dc7c5 diff --git a/trunk/kernel/nsproxy.c b/trunk/kernel/nsproxy.c index 1bc4b55241a8..9e83b589f754 100644 --- a/trunk/kernel/nsproxy.c +++ b/trunk/kernel/nsproxy.c @@ -145,13 +145,11 @@ void free_nsproxy(struct nsproxy *ns) /* * Called from unshare. Unshare all the namespaces part of nsproxy. - * On sucess, returns the new nsproxy and a reference to old nsproxy - * to make sure it stays around. + * On success, returns the new nsproxy. */ int unshare_nsproxy_namespaces(unsigned long unshare_flags, struct nsproxy **new_nsp, struct fs_struct *new_fs) { - struct nsproxy *old_ns = current->nsproxy; int err = 0; if (!(unshare_flags & (CLONE_NEWNS | CLONE_NEWUTS | CLONE_NEWIPC))) @@ -170,13 +168,9 @@ int unshare_nsproxy_namespaces(unsigned long unshare_flags, if (!capable(CAP_SYS_ADMIN)) return -EPERM; - get_nsproxy(old_ns); - *new_nsp = create_new_namespaces(unshare_flags, current, new_fs ? new_fs : current->fs); - if (IS_ERR(*new_nsp)) { + if (IS_ERR(*new_nsp)) err = PTR_ERR(*new_nsp); - put_nsproxy(old_ns); - } return err; }