Commit bdfae5ce authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fs.idmapped.vfsuid.v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux 

Pull fs idmapping updates from Christian Brauner:
 "This introduces the new vfs{g,u}id_t types we agreed on. Similar to
  k{g,u}id_t the new types are just simple wrapper structs around
  regular {g,u}id_t types.

  They allow to establish a type safety boundary in the VFS for idmapped
  mounts preventing confusion betwen {g,u}ids mapped into an idmapped
  mount and {g,u}ids mapped into the caller's or the filesystem's
  idmapping.

  An initial set of helpers is introduced that allows to operate on
  vfs{g,u}id_t types. We will remove all references to non-type safe
  idmapped mounts helpers in the very near future. The patches do
  already exist.

  This converts the core attribute changing codepaths which become
  significantly easier to reason about because of this change.

  Just a few highlights here as the patches give detailed overviews of
  what is happening in the commit messages:

   - The kernel internal struct iattr contains type safe vfs{g,u}id_t
     values clearly communicating that these values have to take a given
     mount's idmapping into account.

   - The ownership values placed in struct iattr to change ownership are
     identical for idmapped and non-idmapped mounts going forward. This
     also allows to simplify stacking filesystems such as overlayfs that
     change attributes In other words, they always represent the values.

   - Instead of open coding checks for whether ownership changes have
     been requested and an actual update of the inode is required we now
     have small static inline wrappers that abstract this logic away
     removing a lot of code duplication from individual filesystems that
     all open-coded the same checks"

* tag 'fs.idmapped.vfsuid.v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux:
  mnt_idmapping: align kernel doc and parameter order
  mnt_idmapping: use new helpers in mapped_fs{g,u}id()
  fs: port HAS_UNMAPPED_ID() to vfs{g,u}id_t
  mnt_idmapping: return false when comparing two invalid ids
  attr: fix kernel doc
  attr: port attribute changes to new types
  security: pass down mount idmapping to setattr hook
  quota: port quota helpers mount ids
  fs: port to iattr ownership update helpers
  fs: introduce tiny iattr ownership update helpers
  fs: use mount types in iattr
  fs: add two type safe mapping helpers
  mnt_idmapping: add vfs{g,u}id_t
parents e6a7cf70 77940f0d

fs/attr.c

+34 −40
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
 * chown_ok - verify permissions to chown inode

 * @mnt_userns:	user namespace of the mount @inode was found from

 * @inode:	inode to check permissions on

 * @uid:	uid to chown @inode to

 * @ia_vfsuid:	uid to chown @inode to

 *

 * If the inode has been found through an idmapped mount the user namespace of

 * the vfsmount must be passed through @mnt_userns. This function will then
@@ -31,15 +31,15 @@ 
 * performed on the raw inode simply passs init_user_ns.

 */

static bool chown_ok(struct user_namespace *mnt_userns,

		     const struct inode *inode,

		     kuid_t uid)

		     const struct inode *inode, vfsuid_t ia_vfsuid)

{

	kuid_t kuid = i_uid_into_mnt(mnt_userns, inode);

	if (uid_eq(current_fsuid(), kuid) && uid_eq(uid, inode->i_uid))

	vfsuid_t vfsuid = i_uid_into_vfsuid(mnt_userns, inode);

	if (vfsuid_eq_kuid(vfsuid, current_fsuid()) &&

	    vfsuid_eq(ia_vfsuid, vfsuid))

		return true;

	if (capable_wrt_inode_uidgid(mnt_userns, inode, CAP_CHOWN))

		return true;

	if (uid_eq(kuid, INVALID_UID) &&

	if (!vfsuid_valid(vfsuid) &&

	    ns_capable(inode->i_sb->s_user_ns, CAP_CHOWN))

		return true;

	return false;
@@ -49,7 +49,7 @@ static bool chown_ok(struct user_namespace *mnt_userns, 
 * chgrp_ok - verify permissions to chgrp inode

 * @mnt_userns:	user namespace of the mount @inode was found from

 * @inode:	inode to check permissions on

 * @gid:	gid to chown @inode to

 * @ia_vfsgid:	gid to chown @inode to

 *

 * If the inode has been found through an idmapped mount the user namespace of

 * the vfsmount must be passed through @mnt_userns. This function will then
@@ -58,21 +58,19 @@ static bool chown_ok(struct user_namespace *mnt_userns, 
 * performed on the raw inode simply passs init_user_ns.

 */

static bool chgrp_ok(struct user_namespace *mnt_userns,

		     const struct inode *inode, kgid_t gid)

		     const struct inode *inode, vfsgid_t ia_vfsgid)

{

	kgid_t kgid = i_gid_into_mnt(mnt_userns, inode);

	if (uid_eq(current_fsuid(), i_uid_into_mnt(mnt_userns, inode))) {

		kgid_t mapped_gid;



		if (gid_eq(gid, inode->i_gid))

	vfsgid_t vfsgid = i_gid_into_vfsgid(mnt_userns, inode);

	vfsuid_t vfsuid = i_uid_into_vfsuid(mnt_userns, inode);

	if (vfsuid_eq_kuid(vfsuid, current_fsuid())) {

		if (vfsgid_eq(ia_vfsgid, vfsgid))

			return true;

		mapped_gid = mapped_kgid_fs(mnt_userns, i_user_ns(inode), gid);

		if (in_group_p(mapped_gid))

		if (vfsgid_in_group_p(ia_vfsgid))

			return true;

	}

	if (capable_wrt_inode_uidgid(mnt_userns, inode, CAP_CHOWN))

		return true;

	if (gid_eq(kgid, INVALID_GID) &&

	if (!vfsgid_valid(vfsgid) &&

	    ns_capable(inode->i_sb->s_user_ns, CAP_CHOWN))

		return true;

	return false;
@@ -120,28 +118,29 @@ int setattr_prepare(struct user_namespace *mnt_userns, struct dentry *dentry, 
		goto kill_priv;



	/* Make sure a caller can chown. */

	if ((ia_valid & ATTR_UID) && !chown_ok(mnt_userns, inode, attr->ia_uid))

	if ((ia_valid & ATTR_UID) &&

	    !chown_ok(mnt_userns, inode, attr->ia_vfsuid))

		return -EPERM;



	/* Make sure caller can chgrp. */

	if ((ia_valid & ATTR_GID) && !chgrp_ok(mnt_userns, inode, attr->ia_gid))

	if ((ia_valid & ATTR_GID) &&

	    !chgrp_ok(mnt_userns, inode, attr->ia_vfsgid))

		return -EPERM;



	/* Make sure a caller can chmod. */

	if (ia_valid & ATTR_MODE) {

		kgid_t mapped_gid;

		vfsgid_t vfsgid;



		if (!inode_owner_or_capable(mnt_userns, inode))

			return -EPERM;



		if (ia_valid & ATTR_GID)

			mapped_gid = mapped_kgid_fs(mnt_userns,

						i_user_ns(inode), attr->ia_gid);

			vfsgid = attr->ia_vfsgid;

		else

			mapped_gid = i_gid_into_mnt(mnt_userns, inode);

			vfsgid = i_gid_into_vfsgid(mnt_userns, inode);



		/* Also check the setgid bit! */

		if (!in_group_p(mapped_gid) &&

		if (!vfsgid_in_group_p(vfsgid) &&

		    !capable_wrt_inode_uidgid(mnt_userns, inode, CAP_FSETID))

			attr->ia_mode &= ~S_ISGID;

	}
@@ -219,9 +218,7 @@ EXPORT_SYMBOL(inode_newsize_ok); 
 * setattr_copy must be called with i_mutex held.

 *

 * setattr_copy updates the inode's metadata with that specified

 * in attr on idmapped mounts. If file ownership is changed setattr_copy

 * doesn't map ia_uid and ia_gid. It will asssume the caller has already

 * provided the intended values. Necessary permission checks to determine

 * in attr on idmapped mounts. Necessary permission checks to determine

 * whether or not the S_ISGID property needs to be removed are performed with

 * the correct idmapped mount permission helpers.

 * Noticeably missing is inode size update, which is more complex
@@ -242,10 +239,8 @@ void setattr_copy(struct user_namespace *mnt_userns, struct inode *inode, 
{

	unsigned int ia_valid = attr->ia_valid;



	if (ia_valid & ATTR_UID)

		inode->i_uid = attr->ia_uid;

	if (ia_valid & ATTR_GID)

		inode->i_gid = attr->ia_gid;

	i_uid_update(mnt_userns, attr, inode);

	i_gid_update(mnt_userns, attr, inode);

	if (ia_valid & ATTR_ATIME)

		inode->i_atime = attr->ia_atime;

	if (ia_valid & ATTR_MTIME)
@@ -254,8 +249,8 @@ void setattr_copy(struct user_namespace *mnt_userns, struct inode *inode, 
		inode->i_ctime = attr->ia_ctime;

	if (ia_valid & ATTR_MODE) {

		umode_t mode = attr->ia_mode;

		kgid_t kgid = i_gid_into_mnt(mnt_userns, inode);

		if (!in_group_p(kgid) &&

		vfsgid_t vfsgid = i_gid_into_vfsgid(mnt_userns, inode);

		if (!vfsgid_in_group_p(vfsgid) &&

		    !capable_wrt_inode_uidgid(mnt_userns, inode, CAP_FSETID))

			mode &= ~S_ISGID;

		inode->i_mode = mode;
@@ -306,9 +301,6 @@ EXPORT_SYMBOL(may_setattr); 
 * retry.  Because breaking a delegation may take a long time, the

 * caller should drop the i_mutex before doing so.

 *

 * If file ownership is changed notify_change() doesn't map ia_uid and

 * ia_gid. It will asssume the caller has already provided the intended values.

 *

 * Alternatively, a caller may pass NULL for delegated_inode.  This may

 * be appropriate for callers that expect the underlying filesystem not

 * to be NFS exported.  Also, passing NULL is fine for callers holding
@@ -397,23 +389,25 @@ int notify_change(struct user_namespace *mnt_userns, struct dentry *dentry, 
	 * namespace of the superblock.

	 */

	if (ia_valid & ATTR_UID &&

	    !kuid_has_mapping(inode->i_sb->s_user_ns, attr->ia_uid))

	    !vfsuid_has_fsmapping(mnt_userns, inode->i_sb->s_user_ns,

				  attr->ia_vfsuid))

		return -EOVERFLOW;

	if (ia_valid & ATTR_GID &&

	    !kgid_has_mapping(inode->i_sb->s_user_ns, attr->ia_gid))

	    !vfsgid_has_fsmapping(mnt_userns, inode->i_sb->s_user_ns,

				  attr->ia_vfsgid))

		return -EOVERFLOW;



	/* Don't allow modifications of files with invalid uids or

	 * gids unless those uids & gids are being made valid.

	 */

	if (!(ia_valid & ATTR_UID) &&

	    !uid_valid(i_uid_into_mnt(mnt_userns, inode)))

	    !vfsuid_valid(i_uid_into_vfsuid(mnt_userns, inode)))

		return -EOVERFLOW;

	if (!(ia_valid & ATTR_GID) &&

	    !gid_valid(i_gid_into_mnt(mnt_userns, inode)))

	    !vfsgid_valid(i_gid_into_vfsgid(mnt_userns, inode)))

		return -EOVERFLOW;



	error = security_inode_setattr(dentry, attr);

	error = security_inode_setattr(mnt_userns, dentry, attr);

	if (error)

		return error;

	error = try_break_deleg(inode, delegated_inode);

fs/ext2/inode.c

+4 −4
Original line number Diff line number Diff line
@@ -1679,14 +1679,14 @@ int ext2_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, 
	if (error)

		return error;



	if (is_quota_modification(inode, iattr)) {

	if (is_quota_modification(mnt_userns, inode, iattr)) {

		error = dquot_initialize(inode);

		if (error)

			return error;

	}

	if ((iattr->ia_valid & ATTR_UID && !uid_eq(iattr->ia_uid, inode->i_uid)) ||

	    (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid))) {

		error = dquot_transfer(inode, iattr);

	if (i_uid_needs_update(mnt_userns, iattr, inode) ||

	    i_gid_needs_update(mnt_userns, iattr, inode)) {

		error = dquot_transfer(mnt_userns, inode, iattr);

		if (error)

			return error;

	}

fs/ext4/inode.c

+6 −8
Original line number Diff line number Diff line
@@ -5350,14 +5350,14 @@ int ext4_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, 
	if (error)

		return error;



	if (is_quota_modification(inode, attr)) {

	if (is_quota_modification(mnt_userns, inode, attr)) {

		error = dquot_initialize(inode);

		if (error)

			return error;

	}



	if ((ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, inode->i_uid)) ||

	    (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid))) {

	if (i_uid_needs_update(mnt_userns, attr, inode) ||

	    i_gid_needs_update(mnt_userns, attr, inode)) {

		handle_t *handle;



		/* (user+group)*(old+new) structure, inode write (sb,
@@ -5374,7 +5374,7 @@ int ext4_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, 
		 * counts xattr inode references.

		 */

		down_read(&EXT4_I(inode)->xattr_sem);

		error = dquot_transfer(inode, attr);

		error = dquot_transfer(mnt_userns, inode, attr);

		up_read(&EXT4_I(inode)->xattr_sem);



		if (error) {
@@ -5383,10 +5383,8 @@ int ext4_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, 
		}

		/* Update corresponding info in inode so that everything is in

		 * one transaction */

		if (attr->ia_valid & ATTR_UID)

			inode->i_uid = attr->ia_uid;

		if (attr->ia_valid & ATTR_GID)

			inode->i_gid = attr->ia_gid;

		i_uid_update(mnt_userns, attr, inode);

		i_gid_update(mnt_userns, attr, inode);

		error = ext4_mark_inode_dirty(handle, inode);

		ext4_journal_stop(handle);

		if (unlikely(error)) {

fs/f2fs/file.c

+8 −14
Original line number Diff line number Diff line
@@ -861,10 +861,8 @@ static void __setattr_copy(struct user_namespace *mnt_userns, 
{

	unsigned int ia_valid = attr->ia_valid;



	if (ia_valid & ATTR_UID)

		inode->i_uid = attr->ia_uid;

	if (ia_valid & ATTR_GID)

		inode->i_gid = attr->ia_gid;

	i_uid_update(mnt_userns, attr, inode);

	i_gid_update(mnt_userns, attr, inode);

	if (ia_valid & ATTR_ATIME)

		inode->i_atime = attr->ia_atime;

	if (ia_valid & ATTR_MTIME)
@@ -917,17 +915,15 @@ int f2fs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, 
	if (err)

		return err;



	if (is_quota_modification(inode, attr)) {

	if (is_quota_modification(mnt_userns, inode, attr)) {

		err = f2fs_dquot_initialize(inode);

		if (err)

			return err;

	}

	if ((attr->ia_valid & ATTR_UID &&

		!uid_eq(attr->ia_uid, inode->i_uid)) ||

		(attr->ia_valid & ATTR_GID &&

		!gid_eq(attr->ia_gid, inode->i_gid))) {

	if (i_uid_needs_update(mnt_userns, attr, inode) ||

	    i_gid_needs_update(mnt_userns, attr, inode)) {

		f2fs_lock_op(F2FS_I_SB(inode));

		err = dquot_transfer(inode, attr);

		err = dquot_transfer(mnt_userns, inode, attr);

		if (err) {

			set_sbi_flag(F2FS_I_SB(inode),

					SBI_QUOTA_NEED_REPAIR);
@@ -938,10 +934,8 @@ int f2fs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, 
		 * update uid/gid under lock_op(), so that dquot and inode can

		 * be updated atomically.

		 */

		if (attr->ia_valid & ATTR_UID)

			inode->i_uid = attr->ia_uid;

		if (attr->ia_valid & ATTR_GID)

			inode->i_gid = attr->ia_gid;

		i_uid_update(mnt_userns, attr, inode);

		i_gid_update(mnt_userns, attr, inode);

		f2fs_mark_inode_dirty_sync(inode, true);

		f2fs_unlock_op(F2FS_I_SB(inode));

	}

fs/f2fs/recovery.c

+5 −5
Original line number Diff line number Diff line
@@ -255,18 +255,18 @@ static int recover_quota_data(struct inode *inode, struct page *page) 


	memset(&attr, 0, sizeof(attr));



	attr.ia_uid = make_kuid(inode->i_sb->s_user_ns, i_uid);

	attr.ia_gid = make_kgid(inode->i_sb->s_user_ns, i_gid);

	attr.ia_vfsuid = VFSUIDT_INIT(make_kuid(inode->i_sb->s_user_ns, i_uid));

	attr.ia_vfsgid = VFSGIDT_INIT(make_kgid(inode->i_sb->s_user_ns, i_gid));



	if (!uid_eq(attr.ia_uid, inode->i_uid))

	if (!vfsuid_eq(attr.ia_vfsuid, i_uid_into_vfsuid(&init_user_ns, inode)))

		attr.ia_valid |= ATTR_UID;

	if (!gid_eq(attr.ia_gid, inode->i_gid))

	if (!vfsgid_eq(attr.ia_vfsgid, i_gid_into_vfsgid(&init_user_ns, inode)))

		attr.ia_valid |= ATTR_GID;



	if (!attr.ia_valid)

		return 0;



	err = dquot_transfer(inode, &attr);

	err = dquot_transfer(&init_user_ns, inode, &attr);

	if (err)

		set_sbi_flag(F2FS_I_SB(inode), SBI_QUOTA_NEED_REPAIR);

	return err;