Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / kernel / capability.c

diff --git a/kernel/capability.c b/kernel/capability.c
index cc5f0718215dc418dc116da6ba2e0148445f0158..493d97259484cfef006c59b934be4fcf9663d1ac 100644 (file)
--- a/kernel/capability.c
+++ b/kernel/capability.c
@@ -429,12 +429,14 @@ bool nsown_capable(int cap)
  * targeted at it's own user namespace and that the given inode is owned
  * by the current user namespace or a child namespace.
  *
- * Currently inodes can only be owned by the initial user 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) && (ns == &init_user_ns);
+       return ns_capable(ns, cap) && kuid_has_mapping(ns, inode->i_uid);
 }