aboutsummaryrefslogtreecommitdiff
path: root/fs/fuse
diff options
context:
space:
mode:
authorGravatar Christian Brauner <brauner@kernel.org> 2022-09-09 11:40:21 +0200
committerGravatar Miklos Szeredi <mszeredi@redhat.com> 2022-11-23 09:10:49 +0100
commit00d369bc2de5986504fc0d60bfeae4c342b2cad5 (patch)
tree581ba4bd921239d00b699bd1b276b504baedf6b8 /fs/fuse
parentfuse: Remove user_ns check for FUSE_DEV_IOC_CLONE (diff)
downloadlinux-00d369bc2de5986504fc0d60bfeae4c342b2cad5.tar.gz
linux-00d369bc2de5986504fc0d60bfeae4c342b2cad5.tar.bz2
linux-00d369bc2de5986504fc0d60bfeae4c342b2cad5.zip
fuse: port to vfs{g,u}id_t and associated helpers
A while ago we introduced a dedicated vfs{g,u}id_t type in commit 1e5267cd0895 ("mnt_idmapping: add vfs{g,u}id_t"). We already switched over a good part of the VFS. Ultimately we will remove all legacy idmapped mount helpers that operate only on k{g,u}id_t in favor of the new type safe helpers that operate on vfs{g,u}id_t. Cc: Seth Forshee (Digital Ocean) <sforshee@kernel.org> Cc: Christoph Hellwig <hch@lst.de> Signed-off-by: Christian Brauner (Microsoft) <brauner@kernel.org> Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'fs/fuse')
-rw-r--r--fs/fuse/acl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fuse/acl.c b/fs/fuse/acl.c
index 337cb29a8dd5..84c1ca4bc1dc 100644
--- a/fs/fuse/acl.c
+++ b/fs/fuse/acl.c
@@ -98,7 +98,7 @@ int fuse_set_acl(struct user_namespace *mnt_userns, struct inode *inode,
return ret;
}
- if (!in_group_p(i_gid_into_mnt(&init_user_ns, inode)) &&
+ if (!vfsgid_in_group_p(i_gid_into_vfsgid(&init_user_ns, inode)) &&
!capable_wrt_inode_uidgid(&init_user_ns, inode, CAP_FSETID))
extra_flags |= FUSE_SETXATTR_ACL_KILL_SGID;