1 files changed, 35 insertions, 68 deletions

diff --git a/kernel/capability.c b/kernel/capability.c
index 493d9725948..283c529f8b1 100644
--- a/kernel/capability.c
+++ b/kernel/capability.c
@@ -10,7 +10,7 @@
 #include <linux/audit.h>
 #include <linux/capability.h>
 #include <linux/mm.h>
-#include <linux/export.h>
+#include <linux/module.h>
 #include <linux/security.h>
 #include <linux/syscalls.h>
 #include <linux/pid_namespace.h>
@@ -287,84 +287,74 @@ error:
 }
 
 /**
- * has_ns_capability - Does a task have a capability in a specific user ns
+ * has_capability - Does a task have a capability in init_user_ns
  * @t: The task in question
- * @ns: target user namespace
  * @cap: The capability to be tested for
  *
  * Return true if the specified task has the given superior capability
- * currently in effect to the specified user namespace, false if not.
+ * currently in effect to the initial user namespace, false if not.
  *
  * Note that this does not set PF_SUPERPRIV on the task.
  */
-bool has_ns_capability(struct task_struct *t,
-                       struct user_namespace *ns, int cap)
+bool has_capability(struct task_struct *t, int cap)
 {
-        int ret;
-
-        rcu_read_lock();
-        ret = security_capable(__task_cred(t), ns, cap);
-        rcu_read_unlock();
+        int ret = security_real_capable(t, &init_user_ns, cap);
 
         return (ret == 0);
 }
 
 /**
- * has_capability - Does a task have a capability in init_user_ns
+ * has_capability - Does a task have a capability in a specific user ns
  * @t: The task in question
+ * @ns: target user namespace
  * @cap: The capability to be tested for
  *
  * Return true if the specified task has the given superior capability
- * currently in effect to the initial user namespace, false if not.
+ * currently in effect to the specified user namespace, false if not.
  *
  * Note that this does not set PF_SUPERPRIV on the task.
  */
-bool has_capability(struct task_struct *t, int cap)
+bool has_ns_capability(struct task_struct *t,
+                       struct user_namespace *ns, int cap)
 {
-        return has_ns_capability(t, &init_user_ns, cap);
+        int ret = security_real_capable(t, ns, cap);
+
+        return (ret == 0);
 }
 
 /**
- * has_ns_capability_noaudit - Does a task have a capability (unaudited)
- * in a specific user ns.
+ * has_capability_noaudit - Does a task have a capability (unaudited)
  * @t: The task in question
- * @ns: target user namespace
  * @cap: The capability to be tested for
  *
  * Return true if the specified task has the given superior capability
- * currently in effect to the specified user namespace, false if not.
- * Do not write an audit message for the check.
+ * currently in effect to init_user_ns, false if not.  Don't write an
+ * audit message for the check.
  *
  * Note that this does not set PF_SUPERPRIV on the task.
  */
-bool has_ns_capability_noaudit(struct task_struct *t,
-                               struct user_namespace *ns, int cap)
+bool has_capability_noaudit(struct task_struct *t, int cap)
 {
-        int ret;
-
-        rcu_read_lock();
-        ret = security_capable_noaudit(__task_cred(t), ns, cap);
-        rcu_read_unlock();
+        int ret = security_real_capable_noaudit(t, &init_user_ns, cap);
 
         return (ret == 0);
 }
 
 /**
- * has_capability_noaudit - Does a task have a capability (unaudited) in the
- * initial user ns
- * @t: The task in question
+ * capable - Determine if the current task has a superior capability in effect
  * @cap: The capability to be tested for
  *
- * Return true if the specified task has the given superior capability
- * currently in effect to init_user_ns, false if not.  Don't write an
- * audit message for the check.
+ * Return true if the current task has the given superior capability currently
+ * available for use, false if not.
  *
- * Note that this does not set PF_SUPERPRIV on the task.
+ * This sets PF_SUPERPRIV on the task if the capability is available on the
+ * assumption that it's about to be used.
  */
-bool has_capability_noaudit(struct task_struct *t, int cap)
+bool capable(int cap)
 {
-        return has_ns_capability_noaudit(t, &init_user_ns, cap);
+        return ns_capable(&init_user_ns, cap);
 }
+EXPORT_SYMBOL(capable);
 
 /**
  * ns_capable - Determine if the current task has a superior capability in effect
@@ -384,7 +374,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
                 BUG();
         }
 
-        if (security_capable(current_cred(), ns, cap) == 0) {
+        if (security_capable(ns, current_cred(), cap) == 0) {
                 current->flags |= PF_SUPERPRIV;
                 return true;
         }
@@ -393,20 +383,18 @@ bool ns_capable(struct user_namespace *ns, int cap)
 EXPORT_SYMBOL(ns_capable);
 
 /**
- * capable - Determine if the current task has a superior capability in effect
- * @cap: The capability to be tested for
+ * 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 the current task has the given superior capability currently
- * available for use, false if not.
- *
- * This sets PF_SUPERPRIV on the task if the capability is available on the
- * assumption that it's about to be used.
+ *  Return true if it does, false otherwise.
  */
-bool capable(int cap)
+bool task_ns_capable(struct task_struct *t, int cap)
 {
-        return ns_capable(&init_user_ns, cap);
+        return ns_capable(task_cred_xxx(t, user)->user_ns, cap);
 }
-EXPORT_SYMBOL(capable);
+EXPORT_SYMBOL(task_ns_capable);
 
 /**
  * nsown_capable - Check superior capability to one's own user_ns
@@ -419,24 +407,3 @@ bool nsown_capable(int cap)
 {
         return ns_capable(current_user_ns(), cap);
 }
-
-/**
- * inode_capable - Check superior capability over inode
- * @inode: The inode in question
- * @cap: The capability in question
- *
- * Return true if the current task has the given superior capability
- * targeted at it's own user namespace and that the given inode is owned
- * by the current user namespace or a child namespace.
- *
- * Currently we check to see if an inode is owned by the current
- * user namespace by seeing if the inode's owner maps into the
- * current user namespace.
- *
- */
-bool inode_capable(const struct inode *inode, int cap)
-{
-        struct user_namespace *ns = current_user_ns();
-
-        return ns_capable(ns, cap) && kuid_has_mapping(ns, inode->i_uid);
-}