| Message ID | 20220922151728.1557914-7-brauner@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | acl: add vfs posix acl api | expand |
On Thu, Sep 22, 2022 at 05:17:04PM +0200, Christian Brauner wrote: > -static struct posix_acl *__v9fs_get_acl(struct p9_fid *fid, char *name) > +static int v9fs_fid_get_acl(struct p9_fid *fid, const char *name, > + struct posix_acl **kacl) > { > ssize_t size; > void *value = NULL; > struct posix_acl *acl = NULL; > > size = v9fs_fid_xattr_get(fid, name, NULL, 0); > - if (size > 0) { > - value = kzalloc(size, GFP_NOFS); > - if (!value) > - return ERR_PTR(-ENOMEM); > - size = v9fs_fid_xattr_get(fid, name, value, size); > - if (size > 0) { > - acl = posix_acl_from_xattr(&init_user_ns, value, size); > - if (IS_ERR(acl)) > - goto err_out; > - } > - } else if (size == -ENODATA || size == 0 || > - size == -ENOSYS || size == -EOPNOTSUPP) { > - acl = NULL; > - } else > - acl = ERR_PTR(-EIO); > + if (size <= 0) > + goto out; > > -err_out: > + /* just return the size */ > + if (!kacl) > + goto out; How can that happen? Both callers are passing addresses of local variables as the third argument. And what's the point of that kacl thing, anyway? Same callers would be much happier if you returned acl or ERR_PTR()... > + value = kzalloc(size, GFP_NOFS); > + if (!value) { > + size = -ENOMEM; > + goto out; > + } > + > + size = v9fs_fid_xattr_get(fid, name, value, size); > + if (size <= 0) > + goto out; > + > + acl = posix_acl_from_xattr(&init_user_ns, value, size); > + if (IS_ERR(acl)) { > + size = PTR_ERR(acl); > + goto out; > + } > + *kacl = acl; > + > +out: > kfree(value); > + return size; > +} Compare that (and callers of that helper) with static struct posix_acl *v9fs_fid_get_acl(struct p9_fid *fid, const char *name) { ssize_t size; void *value; struct posix_acl *acl; size = v9fs_fid_xattr_get(fid, name, NULL, 0); if (size <= 0) return ERR_PTR(size); value = kzalloc(size, GFP_NOFS); if (!value) return ERR_PTR(-ENOMEM); size = v9fs_fid_xattr_get(fid, name, value, size); if (size > 0) acl = posix_acl_from_xattr(&init_user_ns, value, size); else acl = ERR_PTR(size); kfree(value); return acl; } static struct posix_acl *v9fs_acl_get(struct dentry *dentry, const char *name) { struct p9_fid *fid; struct posix_acl *acl; fid = v9fs_fid_lookup(dentry); if (IS_ERR(fid)) return ERR_CAST(fid); acl = v9fs_fid_get_acl(fid, name); p9_fid_put(fid); return acl; } static struct posix_acl *__v9fs_get_acl(struct p9_fid *fid, const char *name) { struct posix_acl *acl = v9fs_fid_get_acl(fid, name); if (IS_ERR(acl)) { if (acl == ERR_PTR(-ENODATA) || acl == ERR_PTR(-ENOSYS) || acl == ERR_PTR(-EOPNOTSUPP)) acl = NULL; else acl = ERR_PTR(-EIO); } return acl; }
On Thu, Sep 22, 2022 at 05:17:04PM +0200, Christian Brauner wrote: > + struct v9fs_session_info *v9ses; > + struct posix_acl *acl = NULL; > + > + v9ses = v9fs_dentry2v9ses(dentry); > + /* We allow set/get/list of acl when access=client is not specified. */ > + if ((v9ses->flags & V9FS_ACCESS_MASK) != V9FS_ACCESS_CLIENT) > + acl = v9fs_acl_get(dentry, posix_acl_xattr_name(type)); > + else > + acl = v9fs_get_cached_acl(d_inode(dentry), type); > + if (IS_ERR(acl)) > + return acl; > + > + return acl; *blink* 1. Set acl to NULL, just in case. 2. Set acl to either one expression or another 3. If acl is an ERR_PTR(something), return acl 4. buggrit, return acl anyway.
On Sat, Sep 24, 2022 at 07:13:52PM +0100, Al Viro wrote: > On Thu, Sep 22, 2022 at 05:17:04PM +0200, Christian Brauner wrote: > > + struct v9fs_session_info *v9ses; > > + struct posix_acl *acl = NULL; > > + > > + v9ses = v9fs_dentry2v9ses(dentry); > > + /* We allow set/get/list of acl when access=client is not specified. */ > > + if ((v9ses->flags & V9FS_ACCESS_MASK) != V9FS_ACCESS_CLIENT) > > + acl = v9fs_acl_get(dentry, posix_acl_xattr_name(type)); > > + else > > + acl = v9fs_get_cached_acl(d_inode(dentry), type); > > + if (IS_ERR(acl)) > > + return acl; > > + > > + return acl; > > *blink* > 1. Set acl to NULL, just in case. > 2. Set acl to either one expression or another > 3. If acl is an ERR_PTR(something), return acl > 4. buggrit, return acl anyway. A little less elegant than I would've liked it to be. Thanks, I fixed that.
On Sat, Sep 24, 2022 at 06:56:49PM +0100, Al Viro wrote: > On Thu, Sep 22, 2022 at 05:17:04PM +0200, Christian Brauner wrote: > > > -static struct posix_acl *__v9fs_get_acl(struct p9_fid *fid, char *name) > > +static int v9fs_fid_get_acl(struct p9_fid *fid, const char *name, > > + struct posix_acl **kacl) > > { > > ssize_t size; > > void *value = NULL; > > struct posix_acl *acl = NULL; > > > > size = v9fs_fid_xattr_get(fid, name, NULL, 0); > > - if (size > 0) { > > - value = kzalloc(size, GFP_NOFS); > > - if (!value) > > - return ERR_PTR(-ENOMEM); > > - size = v9fs_fid_xattr_get(fid, name, value, size); > > - if (size > 0) { > > - acl = posix_acl_from_xattr(&init_user_ns, value, size); > > - if (IS_ERR(acl)) > > - goto err_out; > > - } > > - } else if (size == -ENODATA || size == 0 || > > - size == -ENOSYS || size == -EOPNOTSUPP) { > > - acl = NULL; > > - } else > > - acl = ERR_PTR(-EIO); > > + if (size <= 0) > > + goto out; > > > > -err_out: > > + /* just return the size */ > > + if (!kacl) > > + goto out; > > How can that happen? Both callers are passing addresses of local variables > as the third argument. And what's the point of that kacl thing, anyway? > Same callers would be much happier if you returned acl or ERR_PTR()... Yeah, my bad. I had an initial draft just to get something to test where I returned it through an return argument instead of the function. Seems I missed to fix that spot. Thanks, fixed and also massaged the callers a bit.
diff --git a/fs/9p/acl.c b/fs/9p/acl.c index 4dac4a0dc5f4..0ef3386cf61a 100644 --- a/fs/9p/acl.c +++ b/fs/9p/acl.c @@ -17,34 +17,77 @@ #include "v9fs_vfs.h" #include "fid.h" -static struct posix_acl *__v9fs_get_acl(struct p9_fid *fid, char *name) +static int v9fs_fid_get_acl(struct p9_fid *fid, const char *name, + struct posix_acl **kacl) { ssize_t size; void *value = NULL; struct posix_acl *acl = NULL; size = v9fs_fid_xattr_get(fid, name, NULL, 0); - if (size > 0) { - value = kzalloc(size, GFP_NOFS); - if (!value) - return ERR_PTR(-ENOMEM); - size = v9fs_fid_xattr_get(fid, name, value, size); - if (size > 0) { - acl = posix_acl_from_xattr(&init_user_ns, value, size); - if (IS_ERR(acl)) - goto err_out; - } - } else if (size == -ENODATA || size == 0 || - size == -ENOSYS || size == -EOPNOTSUPP) { - acl = NULL; - } else - acl = ERR_PTR(-EIO); + if (size <= 0) + goto out; -err_out: + /* just return the size */ + if (!kacl) + goto out; + + value = kzalloc(size, GFP_NOFS); + if (!value) { + size = -ENOMEM; + goto out; + } + + size = v9fs_fid_xattr_get(fid, name, value, size); + if (size <= 0) + goto out; + + acl = posix_acl_from_xattr(&init_user_ns, value, size); + if (IS_ERR(acl)) { + size = PTR_ERR(acl); + goto out; + } + *kacl = acl; + +out: kfree(value); + return size; +} + +static struct posix_acl *v9fs_acl_get(struct dentry *dentry, const char *name) +{ + ssize_t size; + struct p9_fid *fid; + struct posix_acl *acl = NULL; + + fid = v9fs_fid_lookup(dentry); + if (IS_ERR(fid)) + return ERR_CAST(fid); + + size = v9fs_fid_get_acl(fid, name, &acl); + p9_fid_put(fid); + + if (size < 0) + return ERR_PTR(size); + return acl; } +static struct posix_acl *__v9fs_get_acl(struct p9_fid *fid, const char *name) +{ + ssize_t size; + struct posix_acl *acl = NULL; + + size = v9fs_fid_get_acl(fid, name, &acl); + if (size > 0) + return acl; + else if (size == -ENODATA || size == 0 || size == -ENOSYS || + size == -EOPNOTSUPP) + return NULL; + + return ERR_PTR(-EIO); +} + int v9fs_get_acl(struct inode *inode, struct p9_fid *fid) { int retval = 0; @@ -89,7 +132,7 @@ static struct posix_acl *v9fs_get_cached_acl(struct inode *inode, int type) return acl; } -struct posix_acl *v9fs_iop_get_acl(struct inode *inode, int type, bool rcu) +struct posix_acl *v9fs_iop_get_inode_acl(struct inode *inode, int type, bool rcu) { struct v9fs_session_info *v9ses; @@ -109,6 +152,24 @@ struct posix_acl *v9fs_iop_get_acl(struct inode *inode, int type, bool rcu) } +struct posix_acl *v9fs_iop_get_acl(struct user_namespace *mnt_userns, + struct dentry *dentry, int type) +{ + struct v9fs_session_info *v9ses; + struct posix_acl *acl = NULL; + + v9ses = v9fs_dentry2v9ses(dentry); + /* We allow set/get/list of acl when access=client is not specified. */ + if ((v9ses->flags & V9FS_ACCESS_MASK) != V9FS_ACCESS_CLIENT) + acl = v9fs_acl_get(dentry, posix_acl_xattr_name(type)); + else + acl = v9fs_get_cached_acl(d_inode(dentry), type); + if (IS_ERR(acl)) + return acl; + + return acl; +} + static int v9fs_set_acl(struct p9_fid *fid, int type, struct posix_acl *acl) { int retval; diff --git a/fs/9p/acl.h b/fs/9p/acl.h index ce5175d463dd..11d3f8ea4ce4 100644 --- a/fs/9p/acl.h +++ b/fs/9p/acl.h @@ -8,8 +8,10 @@ #ifdef CONFIG_9P_FS_POSIX_ACL int v9fs_get_acl(struct inode *inode, struct p9_fid *fid); -struct posix_acl *v9fs_iop_get_acl(struct inode *inode, int type, +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 dentry *dentry, int type); int v9fs_acl_chmod(struct inode *inode, struct p9_fid *fid); int v9fs_set_create_acl(struct inode *inode, struct p9_fid *fid, struct posix_acl *dacl, struct posix_acl *acl); @@ -17,11 +19,18 @@ int v9fs_acl_mode(struct inode *dir, umode_t *modep, struct posix_acl **dpacl, struct posix_acl **pacl); void v9fs_put_acl(struct posix_acl *dacl, struct posix_acl *acl); #else +#define v9fs_iop_get_inode_acl NULL #define v9fs_iop_get_acl NULL static inline int v9fs_get_acl(struct inode *inode, struct p9_fid *fid) { return 0; } +static inline struct posix_acl * +v9fs_iop_get_acl(struct user_namespace *mnt_userns, + struct dentry *dentry, int type) +{ + return NULL; +} static inline int v9fs_acl_chmod(struct inode *inode, struct p9_fid *fid) { return 0; diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c index 0d1a7f2c579d..a4211fcb9168 100644 --- a/fs/9p/vfs_inode_dotl.c +++ b/fs/9p/vfs_inode_dotl.c @@ -983,14 +983,16 @@ const struct inode_operations v9fs_dir_inode_operations_dotl = { .getattr = v9fs_vfs_getattr_dotl, .setattr = v9fs_vfs_setattr_dotl, .listxattr = v9fs_listxattr, - .get_inode_acl = v9fs_iop_get_acl, + .get_inode_acl = v9fs_iop_get_inode_acl, + .get_acl = v9fs_iop_get_acl, }; const struct inode_operations v9fs_file_inode_operations_dotl = { .getattr = v9fs_vfs_getattr_dotl, .setattr = v9fs_vfs_setattr_dotl, .listxattr = v9fs_listxattr, - .get_inode_acl = v9fs_iop_get_acl, + .get_inode_acl = v9fs_iop_get_inode_acl, + .get_acl = v9fs_iop_get_acl, }; const struct inode_operations v9fs_symlink_inode_operations_dotl = { diff --git a/include/linux/posix_acl_xattr.h b/include/linux/posix_acl_xattr.h index 8163dd48c430..ebfa11ac7046 100644 --- a/include/linux/posix_acl_xattr.h +++ b/include/linux/posix_acl_xattr.h @@ -60,6 +60,17 @@ int posix_acl_to_xattr(struct user_namespace *user_ns, struct posix_acl *vfs_set_acl_prepare(struct user_namespace *mnt_userns, struct user_namespace *fs_userns, const void *value, size_t size); +static inline const char *posix_acl_xattr_name(int type) +{ + switch (type) { + case ACL_TYPE_ACCESS: + return XATTR_NAME_POSIX_ACL_ACCESS; + case ACL_TYPE_DEFAULT: + return XATTR_NAME_POSIX_ACL_DEFAULT; + } + + return ""; +} extern const struct xattr_handler posix_acl_access_xattr_handler; extern const struct xattr_handler posix_acl_default_xattr_handler;
The current way of setting and getting posix acls through the generic xattr interface is error prone and type unsafe. The vfs needs to interpret and fixup posix acls before storing or reporting it to userspace. Various hacks exist to make this work. The code is hard to understand and difficult to maintain in it's current form. Instead of making this work by hacking posix acls through xattr handlers we are building a dedicated posix acl api around the get and set inode operations. This removes a lot of hackiness and makes the codepaths easier to maintain. A lot of background can be found in [1]. In order to build a type safe posix api around get and set acl we need all filesystem to implement get and set acl. So far 9p implemented a ->get_inode_acl() operation that didn't require access to the dentry in order to allow (limited) permission checking via posix acls in the vfs. Now that we have get and set acl inode operations that take a dentry argument we can give 9p get and set acl inode operations. This is mostly a light refactoring of the codepaths currently used in 9p posix acl xattr handler. After we have fully implemented the posix acl api and switched the vfs over to it, the 9p specific posix acl xattr handler and associated code will be removed. Note, until the vfs has been switched to the new posix acl api this patch is a non-functional change. Link: https://lore.kernel.org/all/20220801145520.1532837-1-brauner@kernel.org [1] Signed-off-by: Christian Brauner (Microsoft) <brauner@kernel.org> --- fs/9p/acl.c | 97 +++++++++++++++++++++++++++------ fs/9p/acl.h | 11 +++- fs/9p/vfs_inode_dotl.c | 6 +- include/linux/posix_acl_xattr.h | 11 ++++ 4 files changed, 104 insertions(+), 21 deletions(-)