GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-04-01 03:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix refcounting of nsproxy object when unshared

Browse source 
When a namespace is unshared, a refcount on the previous nsproxy is
abusively taken, leading to a memory leak of nsproxy objects.

Signed-off-by: Cedric Le Goater <clg@fr.ibm.com>
Cc: Badari Pulavarty <pbadari@us.ibm.com>
Cc: Herbert Poetzl <herbert@13thfloor.at>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Cedric Le Goater 2007-06-23 17:16:25 -07:00 • committed by Linus Torvalds
parent 6d79af701d
commit 4e71e474c7
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
kernel/nsproxy.c
View file

@ -145,13 +145,11 @@ void free_nsproxy(struct nsproxy *ns)
/* /*
* Called from unshare. Unshare all the namespaces part of nsproxy. * Called from unshare. Unshare all the namespaces part of nsproxy.
* On sucess, returns the new nsproxy and a reference to old nsproxy * On success, returns the new nsproxy.
* to make sure it stays around.
*/ */
int unshare_nsproxy_namespaces(unsigned long unshare_flags, int unshare_nsproxy_namespaces(unsigned long unshare_flags,
struct nsproxy **new_nsp, struct fs_struct *new_fs) struct nsproxy **new_nsp, struct fs_struct *new_fs)
{ {
struct nsproxy *old_ns = current->nsproxy;
int err = 0; int err = 0;
if (!(unshare_flags & (CLONE_NEWNS | CLONE_NEWUTS | CLONE_NEWIPC))) 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)) if (!capable(CAP_SYS_ADMIN))
return -EPERM; return -EPERM;
get_nsproxy(old_ns);
*new_nsp = create_new_namespaces(unshare_flags, current, *new_nsp = create_new_namespaces(unshare_flags, current,
new_fs ? new_fs : current->fs); new_fs ? new_fs : current->fs);
if (IS_ERR(*new_nsp)) { if (IS_ERR(*new_nsp))
err = PTR_ERR(*new_nsp); err = PTR_ERR(*new_nsp);
put_nsproxy(old_ns);
}
return err; return err;
} }