Unverified Commit e65ce2a5 authored by Christian Brauner's avatar Christian Brauner
Browse files

acl: handle idmapped mounts 

The posix acl permission checking helpers determine whether a caller is
privileged over an inode according to the acls associated with the
inode. Add helpers that make it possible to handle acls on idmapped
mounts.

The vfs and the filesystems targeted by this first iteration make use of
posix_acl_fix_xattr_from_user() and posix_acl_fix_xattr_to_user() to
translate basic posix access and default permissions such as the
ACL_USER and ACL_GROUP type according to the initial user namespace (or
the superblock's user namespace) to and from the caller's current user
namespace. Adapt these two helpers to handle idmapped mounts whereby we
either map from or into the mount's user namespace depending on in which
direction we're translating.
Similarly, cap_convert_nscap() is used by the vfs to translate user
namespace and non-user namespace aware filesystem capabilities from the
superblock's user namespace to the caller's user namespace. Enable it to
handle idmapped mounts by accounting for the mount's user namespace.

In addition the fileystems targeted in the first iteration of this patch
series make use of the posix_acl_chmod() and, posix_acl_update_mode()
helpers. Both helpers perform permission checks on the target inode. Let
them handle idmapped mounts. These two helpers are called when posix
acls are set by the respective filesystems to handle this case we extend
the ->set() method to take an additional user namespace argument to pass
the mount's user namespace down.

Link: https://lore.kernel.org/r/20210121131959.646623-9-christian.brauner@ubuntu.com


Cc: Christoph Hellwig <hch@lst.de>
Cc: David Howells <dhowells@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: linux-fsdevel@vger.kernel.org
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarChristian Brauner <christian.brauner@ubuntu.com>
parent 2f221d6f

Documentation/filesystems/locking.rst

+4 −3
Original line number Diff line number Diff line
@@ -126,9 +126,10 @@ prototypes:: 
	int (*get)(const struct xattr_handler *handler, struct dentry *dentry,

		   struct inode *inode, const char *name, void *buffer,

		   size_t size);

	int (*set)(const struct xattr_handler *handler, struct dentry *dentry,

		   struct inode *inode, const char *name, const void *buffer,

		   size_t size, int flags);

	int (*set)(const struct xattr_handler *handler,

                   struct user_namespace *mnt_userns,

                   struct dentry *dentry, struct inode *inode, const char *name,

                   const void *buffer, size_t size, int flags);



locking rules:

	all may block

Documentation/filesystems/porting.rst

+2 −0
Original line number Diff line number Diff line
@@ -717,6 +717,8 @@ be removed. Switch while you still can; the old one won't stay. 
**mandatory**



->setxattr() and xattr_handler.set() get dentry and inode passed separately.

The xattr_handler.set() gets passed the user namespace of the mount the inode

is seen from so filesystems can idmap the i_uid and i_gid accordingly.

dentry might be yet to be attached to inode, so do _not_ use its ->d_inode

in the instances.  Rationale: !@#!@# security_d_instantiate() needs to be

called before we attach dentry to inode and !@#!@##!@$!$#!@#$!@$!@$ smack

fs/9p/acl.c

+3 −1
Original line number Diff line number Diff line
@@ -239,6 +239,7 @@ static int v9fs_xattr_get_acl(const struct xattr_handler *handler, 
}



static int v9fs_xattr_set_acl(const struct xattr_handler *handler,

			      struct user_namespace *mnt_userns,

			      struct dentry *dentry, struct inode *inode,

			      const char *name, const void *value,

			      size_t size, int flags)
@@ -279,7 +280,8 @@ static int v9fs_xattr_set_acl(const struct xattr_handler *handler, 
			struct iattr iattr = { 0 };

			struct posix_acl *old_acl = acl;



			retval = posix_acl_update_mode(inode, &iattr.ia_mode, &acl);

			retval = posix_acl_update_mode(mnt_userns, inode,

						       &iattr.ia_mode, &acl);

			if (retval)

				goto err_out;

			if (!acl) {

fs/9p/xattr.c

+1 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ static int v9fs_xattr_handler_get(const struct xattr_handler *handler, 
}



static int v9fs_xattr_handler_set(const struct xattr_handler *handler,

				  struct user_namespace *mnt_userns,

				  struct dentry *dentry, struct inode *inode,

				  const char *name, const void *value,

				  size_t size, int flags)

fs/afs/xattr.c

+2 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ static const struct afs_operation_ops afs_store_acl_operation = { 
 * Set a file's AFS3 ACL.

 */

static int afs_xattr_set_acl(const struct xattr_handler *handler,

			     struct user_namespace *mnt_userns,

                             struct dentry *dentry,

                             struct inode *inode, const char *name,

                             const void *buffer, size_t size, int flags)
@@ -248,6 +249,7 @@ static const struct afs_operation_ops yfs_store_opaque_acl2_operation = { 
 * Set a file's YFS ACL.

 */

static int afs_xattr_set_yfs(const struct xattr_handler *handler,

			     struct user_namespace *mnt_userns,

                             struct dentry *dentry,

                             struct inode *inode, const char *name,

                             const void *buffer, size_t size, int flags)