rk: revert to v3.10

[firefly-linux-kernel-4.4.55.git] / kernel / capability.c

diff --git a/kernel/capability.c b/kernel/capability.c
index d52eecc0942b0eacc20ef0a7e6bf277d31e87a8f..f6c2ce5701e1c3c723d03e3d917c62f584c3a074 100644 (file)
--- a/kernel/capability.c
+++ b/kernel/capability.c
@@ -445,18 +445,22 @@ bool nsown_capable(int cap)
 }
 
 /**
- * capable_wrt_inode_uidgid - Check nsown_capable and uid and gid mapped
+ * 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 capability targeted at
- * its own user namespace and that the given inode's uid and gid are
- * mapped into the current user namespace.
+ * 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 capable_wrt_inode_uidgid(const struct inode *inode, int cap)
+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) &&
-               kgid_has_mapping(ns, inode->i_gid);
+       return ns_capable(ns, cap) && kuid_has_mapping(ns, inode->i_uid);
 }