Unverified Commit 01beba79 authored by Christian Brauner's avatar Christian Brauner Committed by Christian Brauner (Microsoft)
Browse files

fs: port inode_owner_or_capable() 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 f2d40141

fs/9p/acl.c

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ int v9fs_iop_set_acl(struct mnt_idmap *idmap, struct dentry *dentry, 
		goto err_out;

	}



	if (!inode_owner_or_capable(&init_user_ns, inode)) {

	if (!inode_owner_or_capable(&nop_mnt_idmap, inode)) {

		retval = -EPERM;

		goto err_out;

	}

fs/attr.c

+3 −4
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ int setattr_prepare(struct mnt_idmap *idmap, struct dentry *dentry, 
	if (ia_valid & ATTR_MODE) {

		vfsgid_t vfsgid;



		if (!inode_owner_or_capable(mnt_userns, inode))

		if (!inode_owner_or_capable(idmap, inode))

			return -EPERM;



		if (ia_valid & ATTR_GID)
@@ -211,7 +211,7 @@ int setattr_prepare(struct mnt_idmap *idmap, struct dentry *dentry, 


	/* Check for setting the inode time. */

	if (ia_valid & (ATTR_MTIME_SET | ATTR_ATIME_SET | ATTR_TIMES_SET)) {

		if (!inode_owner_or_capable(mnt_userns, inode))

		if (!inode_owner_or_capable(idmap, inode))

			return -EPERM;

	}
@@ -328,7 +328,6 @@ int may_setattr(struct mnt_idmap *idmap, struct inode *inode, 
		unsigned int ia_valid)

{

	int error;

	struct user_namespace *mnt_userns = mnt_idmap_owner(idmap);



	if (ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID | ATTR_TIMES_SET)) {

		if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
@@ -343,7 +342,7 @@ int may_setattr(struct mnt_idmap *idmap, struct inode *inode, 
		if (IS_IMMUTABLE(inode))

			return -EPERM;



		if (!inode_owner_or_capable(mnt_userns, inode)) {

		if (!inode_owner_or_capable(idmap, inode)) {

			error = inode_permission(idmap, inode, MAY_WRITE);

			if (error)

				return error;

fs/btrfs/ioctl.c

+6 −7
Original line number Diff line number Diff line
@@ -1248,7 +1248,6 @@ static noinline int __btrfs_ioctl_snap_create(struct file *file, 
{

	int namelen;

	int ret = 0;

	struct user_namespace *mnt_userns = mnt_idmap_owner(idmap);



	if (!S_ISDIR(file_inode(file)->i_mode))

		return -ENOTDIR;
@@ -1285,7 +1284,7 @@ static noinline int __btrfs_ioctl_snap_create(struct file *file, 
			btrfs_info(BTRFS_I(file_inode(file))->root->fs_info,

				   "Snapshot src from another FS");

			ret = -EXDEV;

		} else if (!inode_owner_or_capable(mnt_userns, src_inode)) {

		} else if (!inode_owner_or_capable(idmap, src_inode)) {

			/*

			 * Subvolume creation is not restricted, but snapshots

			 * are limited to own subvolumes only
@@ -1424,7 +1423,7 @@ static noinline int btrfs_ioctl_subvol_setflags(struct file *file, 
	u64 flags;

	int ret = 0;



	if (!inode_owner_or_capable(file_mnt_user_ns(file), inode))

	if (!inode_owner_or_capable(file_mnt_idmap(file), inode))

		return -EPERM;



	ret = mnt_want_write_file(file);
@@ -3909,7 +3908,7 @@ static long btrfs_ioctl_quota_rescan_wait(struct btrfs_fs_info *fs_info, 
}



static long _btrfs_ioctl_set_received_subvol(struct file *file,

					    struct user_namespace *mnt_userns,

					    struct mnt_idmap *idmap,

					    struct btrfs_ioctl_received_subvol_args *sa)

{

	struct inode *inode = file_inode(file);
@@ -3921,7 +3920,7 @@ static long _btrfs_ioctl_set_received_subvol(struct file *file, 
	int ret = 0;

	int received_uuid_changed;



	if (!inode_owner_or_capable(mnt_userns, inode))

	if (!inode_owner_or_capable(idmap, inode))

		return -EPERM;



	ret = mnt_want_write_file(file);
@@ -4026,7 +4025,7 @@ static long btrfs_ioctl_set_received_subvol_32(struct file *file, 
	args64->rtime.nsec = args32->rtime.nsec;

	args64->flags = args32->flags;



	ret = _btrfs_ioctl_set_received_subvol(file, file_mnt_user_ns(file), args64);

	ret = _btrfs_ioctl_set_received_subvol(file, file_mnt_idmap(file), args64);

	if (ret)

		goto out;
@@ -4060,7 +4059,7 @@ static long btrfs_ioctl_set_received_subvol(struct file *file, 
	if (IS_ERR(sa))

		return PTR_ERR(sa);



	ret = _btrfs_ioctl_set_received_subvol(file, file_mnt_user_ns(file), sa);

	ret = _btrfs_ioctl_set_received_subvol(file, file_mnt_idmap(file), sa);



	if (ret)

		goto out;

fs/crypto/policy.c

+1 −1
Original line number Diff line number Diff line
@@ -506,7 +506,7 @@ int fscrypt_ioctl_set_policy(struct file *filp, const void __user *arg) 
		return -EFAULT;

	policy.version = version;



	if (!inode_owner_or_capable(&init_user_ns, inode))

	if (!inode_owner_or_capable(&nop_mnt_idmap, inode))

		return -EACCES;



	ret = mnt_want_write_file(filp);

fs/ext2/ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ long ext2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
	case EXT2_IOC_SETVERSION: {

		__u32 generation;



		if (!inode_owner_or_capable(&init_user_ns, inode))

		if (!inode_owner_or_capable(&nop_mnt_idmap, inode))

			return -EPERM;

		ret = mnt_want_write_file(filp);

		if (ret)
@@ -99,7 +99,7 @@ long ext2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
		if (!test_opt(inode->i_sb, RESERVATION) ||!S_ISREG(inode->i_mode))

			return -ENOTTY;



		if (!inode_owner_or_capable(&init_user_ns, inode))

		if (!inode_owner_or_capable(&nop_mnt_idmap, inode))

			return -EACCES;



		if (get_user(rsv_window_size, (int __user *)arg))