提交 b33c77ef 编写于 作者: E Eric W. Biederman

userns: Allow unprivileged users to create new namespaces

If an unprivileged user has the appropriate capabilities in their
current user namespace allow the creation of new namespaces.
Acked-by: NSerge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: N"Eric W. Biederman" <ebiederm@xmission.com>
上级 37657da3
...@@ -122,6 +122,7 @@ static struct nsproxy *create_new_namespaces(unsigned long flags, ...@@ -122,6 +122,7 @@ static struct nsproxy *create_new_namespaces(unsigned long flags,
int copy_namespaces(unsigned long flags, struct task_struct *tsk) int copy_namespaces(unsigned long flags, struct task_struct *tsk)
{ {
struct nsproxy *old_ns = tsk->nsproxy; struct nsproxy *old_ns = tsk->nsproxy;
struct user_namespace *user_ns = task_cred_xxx(tsk, user_ns);
struct nsproxy *new_ns; struct nsproxy *new_ns;
int err = 0; int err = 0;
...@@ -134,7 +135,7 @@ int copy_namespaces(unsigned long flags, struct task_struct *tsk) ...@@ -134,7 +135,7 @@ int copy_namespaces(unsigned long flags, struct task_struct *tsk)
CLONE_NEWPID | CLONE_NEWNET))) CLONE_NEWPID | CLONE_NEWNET)))
return 0; return 0;
if (!capable(CAP_SYS_ADMIN)) { if (!ns_capable(user_ns, CAP_SYS_ADMIN)) {
err = -EPERM; err = -EPERM;
goto out; goto out;
} }
...@@ -191,7 +192,7 @@ int unshare_nsproxy_namespaces(unsigned long unshare_flags, ...@@ -191,7 +192,7 @@ int unshare_nsproxy_namespaces(unsigned long unshare_flags,
CLONE_NEWNET | CLONE_NEWPID))) CLONE_NEWNET | CLONE_NEWPID)))
return 0; return 0;
if (!capable(CAP_SYS_ADMIN)) if (!nsown_capable(CAP_SYS_ADMIN))
return -EPERM; return -EPERM;
*new_nsp = create_new_namespaces(unshare_flags, current, *new_nsp = create_new_namespaces(unshare_flags, current,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册