summaryrefslogtreecommitdiff
path: root/kernel/capability.c
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2012-01-03 17:25:15 (GMT)
committerEric Paris <eparis@redhat.com>2012-01-05 23:52:59 (GMT)
commitf1c84dae0ecc51aa35c81f19a0ebcd6c0921ddcb (patch)
tree59d729bb7806e42a13f0ec1657c90b717c314002 /kernel/capability.c
parentd2a7009f0bb03fa22ad08dd25472efa0568126b9 (diff)
downloadlinux-3.10-f1c84dae0ecc51aa35c81f19a0ebcd6c0921ddcb.zip
linux-3.10-f1c84dae0ecc51aa35c81f19a0ebcd6c0921ddcb.tar.gz
linux-3.10-f1c84dae0ecc51aa35c81f19a0ebcd6c0921ddcb.tar.bz2
capabilities: remove task_ns_* functions
task_ in the front of a function, in the security subsystem anyway, means to me at least, that we are operating with that task as the subject of the security decision. In this case what it means is that we are using current as the subject but we use the task to get the right namespace. Who in the world would ever realize that's what task_ns_capability means just by the name? This patch eliminates the task_ns functions entirely and uses the has_ns_capability function instead. This means we explicitly open code the ns in question in the caller. I think it makes the caller a LOT more clear what is going on. Signed-off-by: Eric Paris <eparis@redhat.com> Acked-by: Serge E. Hallyn <serge.hallyn@canonical.com>
Diffstat (limited to 'kernel/capability.c')
-rw-r--r--kernel/capability.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/kernel/capability.c b/kernel/capability.c
index 4762644..74fb3b6 100644
--- a/kernel/capability.c
+++ b/kernel/capability.c
@@ -409,20 +409,6 @@ bool capable(int cap)
EXPORT_SYMBOL(capable);
/**
- * task_ns_capable - Determine whether current task has a superior
- * capability targeted at a specific task's user namespace.
- * @t: The task whose user namespace is targeted.
- * @cap: The capability in question.
- *
- * Return true if it does, false otherwise.
- */
-bool task_ns_capable(struct task_struct *t, int cap)
-{
- return ns_capable(task_cred_xxx(t, user)->user_ns, cap);
-}
-EXPORT_SYMBOL(task_ns_capable);
-
-/**
* nsown_capable - Check superior capability to one's own user_ns
* @cap: The capability in question
*