lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] unshare system call -v5: unshare namespace

Browse Source 
If the namespace structure is being shared, allocate a new one and copy
information from the current, shared, structure.

Signed-off-by: Janak Desai <janak@us.ibm.com>
Cc: Al Viro <viro@ftp.linux.org.uk>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Cc: Andi Kleen <ak@muc.de>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
JANAK DESAI
2006-02-07 12:59:00 -08:00
committed by Linus Torvalds
parent 99d1419d96
commit 741a295130
3 changed files with 48 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
kernel/fork.c
View File

@ -1388,16 +1388,21 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
}
/*
* Unsharing of namespace for tasks created without CLONE_NEWNS is not
* supported yet
* Unshare the namespace structure if it is being shared
*/
static int unshare_namespace(unsigned long unshare_flags, struct namespace **new_nsp)
static int unshare_namespace(unsigned long unshare_flags, struct namespace **new_nsp, struct fs_struct *new_fs)
{
struct namespace *ns = current->namespace;
if ((unshare_flags & CLONE_NEWNS) &&
(ns && atomic_read(&ns->count) > 1))
return -EINVAL;
(ns && atomic_read(&ns->count) > 1)) {
if (!capable(CAP_SYS_ADMIN))
return -EPERM;
*new_nsp = dup_namespace(current, new_fs ? new_fs : current->fs);
if (!*new_nsp)
return -ENOMEM;
}
return 0;
}
@ -1482,7 +1487,7 @@ asmlinkage long sys_unshare(unsigned long unshare_flags)
goto bad_unshare_out;
if ((err = unshare_fs(unshare_flags, &new_fs)))
goto bad_unshare_cleanup_thread;
if ((err = unshare_namespace(unshare_flags, &new_ns)))
if ((err = unshare_namespace(unshare_flags, &new_ns, new_fs)))
goto bad_unshare_cleanup_fs;
if ((err = unshare_sighand(unshare_flags, &new_sigh)))
goto bad_unshare_cleanup_ns;