Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 251666
b: refs/heads/master
c: 0663c6f
h: refs/heads/master
v: v3
  • Loading branch information
Eric W. Biederman committed May 10, 2011
1 parent c35331f commit fc7449d
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6b4e306aa3dc94a0545eb9279475b1ab6209a31f
refs/heads/master: 0663c6f8fa37d777ede74ff991a0cba3a42fcbd7
42 changes: 42 additions & 0 deletions trunk/kernel/nsproxy.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
#include <linux/pid_namespace.h>
#include <net/net_namespace.h>
#include <linux/ipc_namespace.h>
#include <linux/proc_fs.h>
#include <linux/file.h>
#include <linux/syscalls.h>

static struct kmem_cache *nsproxy_cachep;

Expand Down Expand Up @@ -233,6 +236,45 @@ void exit_task_namespaces(struct task_struct *p)
switch_task_namespaces(p, NULL);
}

SYSCALL_DEFINE2(setns, int, fd, int, nstype)
{
const struct proc_ns_operations *ops;
struct task_struct *tsk = current;
struct nsproxy *new_nsproxy;
struct proc_inode *ei;
struct file *file;
int err;

if (!capable(CAP_SYS_ADMIN))
return -EPERM;

file = proc_ns_fget(fd);
if (IS_ERR(file))
return PTR_ERR(file);

err = -EINVAL;
ei = PROC_I(file->f_dentry->d_inode);
ops = ei->ns_ops;
if (nstype && (ops->type != nstype))
goto out;

new_nsproxy = create_new_namespaces(0, tsk, tsk->fs);
if (IS_ERR(new_nsproxy)) {
err = PTR_ERR(new_nsproxy);
goto out;
}

err = ops->install(new_nsproxy, ei->ns);
if (err) {
free_nsproxy(new_nsproxy);
goto out;
}
switch_task_namespaces(tsk, new_nsproxy);
out:
fput(file);
return err;
}

static int __init nsproxy_cache_init(void)
{
nsproxy_cachep = KMEM_CACHE(nsproxy, SLAB_PANIC);
Expand Down

0 comments on commit fc7449d

Please sign in to comment.