Unverified Commit 8782a9ae authored by Christian Brauner's avatar Christian Brauner Committed by Christian Brauner (Microsoft)
Browse files

fs: port ->fileattr_set() to pass 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 13e83a49

Documentation/filesystems/locking.rst

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ prototypes:: 
				umode_t create_mode);

	int (*tmpfile) (struct mnt_idmap *, struct inode *,

			struct file *, umode_t);

	int (*fileattr_set)(struct user_namespace *mnt_userns,

	int (*fileattr_set)(struct mnt_idmap *idmap,

			    struct dentry *dentry, struct fileattr *fa);

	int (*fileattr_get)(struct dentry *dentry, struct fileattr *fa);

	struct posix_acl * (*get_acl)(struct mnt_idmap *, struct dentry *, int);

Documentation/filesystems/vfs.rst

+1 −1
Original line number Diff line number Diff line
@@ -445,7 +445,7 @@ As of kernel 2.6.22, the following members are defined: 
		int (*tmpfile) (struct mnt_idmap *, struct inode *, struct file *, umode_t);

		struct posix_acl * (*get_acl)(struct mnt_idmap *, struct dentry *, int);

	        int (*set_acl)(struct mnt_idmap *, struct dentry *, struct posix_acl *, int);

		int (*fileattr_set)(struct user_namespace *mnt_userns,

		int (*fileattr_set)(struct mnt_idmap *idmap,

				    struct dentry *dentry, struct fileattr *fa);

		int (*fileattr_get)(struct dentry *dentry, struct fileattr *fa);

	};

fs/btrfs/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ int btrfs_fileattr_get(struct dentry *dentry, struct fileattr *fa) 
	return 0;

}



int btrfs_fileattr_set(struct user_namespace *mnt_userns,

int btrfs_fileattr_set(struct mnt_idmap *idmap,

		       struct dentry *dentry, struct fileattr *fa)

{

	struct inode *inode = d_inode(dentry);

fs/btrfs/ioctl.h

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg);

long btrfs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg);

int btrfs_fileattr_get(struct dentry *dentry, struct fileattr *fa);

int btrfs_fileattr_set(struct user_namespace *mnt_userns,

int btrfs_fileattr_set(struct mnt_idmap *idmap,

		       struct dentry *dentry, struct fileattr *fa);

int btrfs_ioctl_get_supported_features(void __user *arg);

void btrfs_sync_inode_flags_to_i_flags(struct inode *inode);

fs/ecryptfs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -1110,13 +1110,13 @@ static int ecryptfs_fileattr_get(struct dentry *dentry, struct fileattr *fa) 
	return vfs_fileattr_get(ecryptfs_dentry_to_lower(dentry), fa);

}



static int ecryptfs_fileattr_set(struct user_namespace *mnt_userns,

static int ecryptfs_fileattr_set(struct mnt_idmap *idmap,

				 struct dentry *dentry, struct fileattr *fa)

{

	struct dentry *lower_dentry = ecryptfs_dentry_to_lower(dentry);

	int rc;



	rc = vfs_fileattr_set(&init_user_ns, lower_dentry, fa);

	rc = vfs_fileattr_set(&nop_mnt_idmap, lower_dentry, fa);

	fsstack_copy_attr_all(d_inode(dentry), d_inode(lower_dentry));



	return rc;