Unverified Commit 0dbe12f2 authored by Christian Brauner's avatar Christian Brauner Committed by Christian Brauner (Microsoft)
Browse files

fs: port i_{g,u}id_{needs_}update() to mnt_idmap 



Convert to struct mnt_idmap.

Last cycle we merged the necessary infrastructure in
256c8aed ("fs: introduce dedicated idmap type for mounts").
This is just the conversion to struct mnt_idmap.

Currently we still pass around the plain namespace that was attached to a
mount. This is in general pretty convenient but it makes it easy to
conflate namespaces that are relevant on the filesystem with namespaces
that are relevent on the mount level. Especially for non-vfs developers
without detailed knowledge in this area this can be a potential source for
bugs.

Once the conversion to struct mnt_idmap is done all helpers down to the
really low-level helpers will take a struct mnt_idmap argument instead of
two namespace arguments. This way it becomes impossible to conflate the two
eliminating the possibility of any bugs. All of the vfs and all filesystems
only operate on struct mnt_idmap.

Acked-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarChristian Brauner (Microsoft) <brauner@kernel.org>
parent f861646a

fs/attr.c

+2 −2
Original line number Diff line number Diff line
@@ -311,8 +311,8 @@ void setattr_copy(struct mnt_idmap *idmap, struct inode *inode, 
	struct user_namespace *mnt_userns = mnt_idmap_owner(idmap);

	unsigned int ia_valid = attr->ia_valid;



	i_uid_update(mnt_userns, attr, inode);

	i_gid_update(mnt_userns, attr, inode);

	i_uid_update(idmap, attr, inode);

	i_gid_update(idmap, attr, inode);

	if (ia_valid & ATTR_ATIME)

		inode->i_atime = attr->ia_atime;

	if (ia_valid & ATTR_MTIME)

fs/ext4/inode.c

+4 −5
Original line number Diff line number Diff line
@@ -5442,7 +5442,6 @@ int ext4_setattr(struct mnt_idmap *idmap, struct dentry *dentry, 
	int orphan = 0;

	const unsigned int ia_valid = attr->ia_valid;

	bool inc_ivers = true;

	struct user_namespace *mnt_userns = mnt_idmap_owner(idmap);



	if (unlikely(ext4_forced_shutdown(EXT4_SB(inode->i_sb))))

		return -EIO;
@@ -5473,8 +5472,8 @@ int ext4_setattr(struct mnt_idmap *idmap, struct dentry *dentry, 
			return error;

	}



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

	    i_gid_needs_update(mnt_userns, attr, inode)) {

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

	    i_gid_needs_update(idmap, attr, inode)) {

		handle_t *handle;



		/* (user+group)*(old+new) structure, inode write (sb,
@@ -5500,8 +5499,8 @@ int ext4_setattr(struct mnt_idmap *idmap, struct dentry *dentry, 
		}

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

		 * one transaction */

		i_uid_update(mnt_userns, attr, inode);

		i_gid_update(mnt_userns, attr, inode);

		i_uid_update(idmap, attr, inode);

		i_gid_update(idmap, attr, inode);

		error = ext4_mark_inode_dirty(handle, inode);

		ext4_journal_stop(handle);

		if (unlikely(error)) {

fs/f2fs/file.c

+6 −7
Original line number Diff line number Diff line
@@ -909,8 +909,8 @@ static void __setattr_copy(struct mnt_idmap *idmap, 
	unsigned int ia_valid = attr->ia_valid;

	struct user_namespace *mnt_userns = mnt_idmap_owner(idmap);



	i_uid_update(mnt_userns, attr, inode);

	i_gid_update(mnt_userns, attr, inode);

	i_uid_update(idmap, attr, inode);

	i_gid_update(idmap, attr, inode);

	if (ia_valid & ATTR_ATIME)

		inode->i_atime = attr->ia_atime;

	if (ia_valid & ATTR_MTIME)
@@ -934,7 +934,6 @@ static void __setattr_copy(struct mnt_idmap *idmap, 
int f2fs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,

		 struct iattr *attr)

{

	struct user_namespace *mnt_userns = mnt_idmap_owner(idmap);

	struct inode *inode = d_inode(dentry);

	int err;
@@ -970,8 +969,8 @@ int f2fs_setattr(struct mnt_idmap *idmap, struct dentry *dentry, 
		if (err)

			return err;

	}

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

	    i_gid_needs_update(mnt_userns, attr, inode)) {

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

	    i_gid_needs_update(idmap, attr, inode)) {

		f2fs_lock_op(F2FS_I_SB(inode));

		err = dquot_transfer(idmap, inode, attr);

		if (err) {
@@ -984,8 +983,8 @@ int f2fs_setattr(struct mnt_idmap *idmap, struct dentry *dentry, 
		 * update uid/gid under lock_op(), so that dquot and inode can

		 * be updated atomically.

		 */

		i_uid_update(mnt_userns, attr, inode);

		i_gid_update(mnt_userns, attr, inode);

		i_uid_update(idmap, attr, inode);

		i_gid_update(idmap, attr, inode);

		f2fs_mark_inode_dirty_sync(inode, true);

		f2fs_unlock_op(F2FS_I_SB(inode));

	}

fs/quota/dquot.c

+2 −2
Original line number Diff line number Diff line
@@ -2097,7 +2097,7 @@ int dquot_transfer(struct mnt_idmap *idmap, struct inode *inode, 
	if (!dquot_active(inode))

		return 0;



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

	if (i_uid_needs_update(idmap, iattr, inode)) {

		kuid_t kuid = from_vfsuid(mnt_userns, i_user_ns(inode),

					  iattr->ia_vfsuid);
@@ -2111,7 +2111,7 @@ int dquot_transfer(struct mnt_idmap *idmap, struct inode *inode, 
		}

		transfer_to[USRQUOTA] = dquot;

	}

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

	if (i_gid_needs_update(idmap, iattr, inode)) {

		kgid_t kgid = from_vfsgid(mnt_userns, i_user_ns(inode),

					  iattr->ia_vfsgid);

fs/xfs/xfs_iops.c

+2 −2
Original line number Diff line number Diff line
@@ -720,12 +720,12 @@ xfs_setattr_nonsize( 
	 * also.

	 */

	if (XFS_IS_UQUOTA_ON(mp) &&

	    i_uid_needs_update(mnt_userns, iattr, inode)) {

	    i_uid_needs_update(idmap, iattr, inode)) {

		ASSERT(udqp);

		old_udqp = xfs_qm_vop_chown(tp, ip, &ip->i_udquot, udqp);

	}

	if (XFS_IS_GQUOTA_ON(mp) &&

	    i_gid_needs_update(mnt_userns, iattr, inode)) {

	    i_gid_needs_update(idmap, iattr, inode)) {

		ASSERT(xfs_has_pquotino(mp) || !XFS_IS_PQUOTA_ON(mp));

		ASSERT(gdqp);

		old_gdqp = xfs_qm_vop_chown(tp, ip, &ip->i_gdquot, gdqp);