mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
userns: user namespaces: convert several capable() calls
CAP_IPC_OWNER and CAP_IPC_LOCK can be checked against current_user_ns(), because the resource comes from current's own ipc namespace. setuid/setgid are to uids in own namespace, so again checks can be against current_user_ns(). Changelog: Jan 11: Use task_ns_capable() in place of sched_capable(). Jan 11: Use nsown_capable() as suggested by Bastian Blank. Jan 11: Clarify (hopefully) some logic in futex and sched.c Feb 15: use ns_capable for ipc, not nsown_capable Feb 23: let copy_ipcs handle setting ipc_ns->user_ns Feb 23: pass ns down rather than taking it from current [[email protected]: coding-style fixes] Signed-off-by: Serge E. Hallyn <[email protected]> Acked-by: "Eric W. Biederman" <[email protected]> Acked-by: Daniel Lezcano <[email protected]> Acked-by: David Howells <[email protected]> Cc: James Morris <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
b515498f5b
commit
b0e77598f8
13 changed files with 75 additions and 45 deletions
|
|
@ -15,7 +15,8 @@
|
|||
|
||||
#include "util.h"
|
||||
|
||||
static struct ipc_namespace *create_ipc_ns(struct ipc_namespace *old_ns)
|
||||
static struct ipc_namespace *create_ipc_ns(struct task_struct *tsk,
|
||||
struct ipc_namespace *old_ns)
|
||||
{
|
||||
struct ipc_namespace *ns;
|
||||
int err;
|
||||
|
|
@ -44,17 +45,19 @@ static struct ipc_namespace *create_ipc_ns(struct ipc_namespace *old_ns)
|
|||
ipcns_notify(IPCNS_CREATED);
|
||||
register_ipcns_notifier(ns);
|
||||
|
||||
ns->user_ns = old_ns->user_ns;
|
||||
get_user_ns(ns->user_ns);
|
||||
ns->user_ns = get_user_ns(task_cred_xxx(tsk, user)->user_ns);
|
||||
|
||||
return ns;
|
||||
}
|
||||
|
||||
struct ipc_namespace *copy_ipcs(unsigned long flags, struct ipc_namespace *ns)
|
||||
struct ipc_namespace *copy_ipcs(unsigned long flags,
|
||||
struct task_struct *tsk)
|
||||
{
|
||||
struct ipc_namespace *ns = tsk->nsproxy->ipc_ns;
|
||||
|
||||
if (!(flags & CLONE_NEWIPC))
|
||||
return get_ipc_ns(ns);
|
||||
return create_ipc_ns(ns);
|
||||
return create_ipc_ns(tsk, ns);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Reference in a new issue