Permalink
Browse files

userns: Teach inode_capable to understand inodes whose uids map to ot…

…her namespaces.

Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
  • Loading branch information...
ebiederm committed Mar 12, 2012
1 parent 9e4a36e commit 65cc5a17ad3388f89ddc3d68226a09242656809b
Showing with 4 additions and 2 deletions.
  1. +4 −2 kernel/capability.c
View
@@ -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);
}

0 comments on commit 65cc5a1

Please sign in to comment.