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

fs: port ->get_acl() 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 011e2b71

Documentation/filesystems/locking.rst

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ prototypes:: 
	int (*fileattr_set)(struct user_namespace *mnt_userns,

			    struct dentry *dentry, struct fileattr *fa);

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

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

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



locking rules:

	all may block

Documentation/filesystems/vfs.rst

+1 −1
Original line number Diff line number Diff line
@@ -443,7 +443,7 @@ As of kernel 2.6.22, the following members are defined: 
		int (*atomic_open)(struct inode *, struct dentry *, struct file *,

				   unsigned open_flag, umode_t create_mode);

		int (*tmpfile) (struct mnt_idmap *, struct inode *, struct file *, umode_t);

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

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

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

		int (*fileattr_set)(struct user_namespace *mnt_userns,

				    struct dentry *dentry, struct fileattr *fa);

fs/9p/acl.c

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ struct posix_acl *v9fs_iop_get_inode_acl(struct inode *inode, int type, bool rcu 


}



struct posix_acl *v9fs_iop_get_acl(struct user_namespace *mnt_userns,

struct posix_acl *v9fs_iop_get_acl(struct mnt_idmap *idmap,

				   struct dentry *dentry, int type)

{

	struct v9fs_session_info *v9ses;

fs/9p/acl.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
int v9fs_get_acl(struct inode *inode, struct p9_fid *fid);

struct posix_acl *v9fs_iop_get_inode_acl(struct inode *inode, int type,

				   bool rcu);

struct posix_acl *v9fs_iop_get_acl(struct user_namespace *mnt_userns,

struct posix_acl *v9fs_iop_get_acl(struct mnt_idmap *idmap,

					  struct dentry *dentry, int type);

int v9fs_iop_set_acl(struct user_namespace *mnt_userns, struct dentry *dentry,

		     struct posix_acl *acl, int type);

fs/cifs/cifsacl.c

+1 −1
Original line number Diff line number Diff line
@@ -1674,7 +1674,7 @@ id_mode_to_cifs_acl(struct inode *inode, const char *path, __u64 *pnmode, 
	return rc;

}



struct posix_acl *cifs_get_acl(struct user_namespace *mnt_userns,

struct posix_acl *cifs_get_acl(struct mnt_idmap *idmap,

			       struct dentry *dentry, int type)

{

#if defined(CONFIG_CIFS_ALLOW_INSECURE_LEGACY) && defined(CONFIG_CIFS_POSIX)