From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26177ECAAA1 for ; Fri, 9 Sep 2022 14:40:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231200AbiIIOky (ORCPT ); Fri, 9 Sep 2022 10:40:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37274 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230108AbiIIOkv (ORCPT ); Fri, 9 Sep 2022 10:40:51 -0400 Received: from verein.lst.de (verein.lst.de [213.95.11.211]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C7E1B14DC for ; Fri, 9 Sep 2022 07:40:50 -0700 (PDT) Received: by verein.lst.de (Postfix, from userid 2407) id 8921768AA6; Fri, 9 Sep 2022 16:40:47 +0200 (CEST) Date: Fri, 9 Sep 2022 16:40:47 +0200 From: Christoph Hellwig To: Christian Brauner Cc: "Darrick J . Wong" , Dave Chinner , Seth Forshee , Christoph Hellwig , linux-xfs@vger.kernel.org Subject: Re: [PATCH] xfs: port to vfs{g,u}id_t and associated helpers Message-ID: <20220909144047.GA10312@lst.de> References: <20220909095659.944062-1-brauner@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220909095659.944062-1-brauner@kernel.org> User-Agent: Mutt/1.5.17 (2007-11-01) Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org On Fri, Sep 09, 2022 at 11:56:59AM +0200, Christian Brauner wrote: > 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: Dave Chinner > Cc: Seth Forshee (Digital Ocean) > Cc: Christoph Hellwig > Cc: Darrick J. Wong > Cc: linux-xfs@vger.kernel.org > Signed-off-by: Christian Brauner (Microsoft) > --- > fs/xfs/xfs_inode.c | 5 ++--- > fs/xfs/xfs_iops.c | 6 ++++-- > fs/xfs/xfs_itable.c | 8 ++++++-- > 3 files changed, 12 insertions(+), 7 deletions(-) > > diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c > index 28493c8e9bb2..bca204a5aecf 100644 > --- a/fs/xfs/xfs_inode.c > +++ b/fs/xfs/xfs_inode.c > @@ -835,9 +835,8 @@ xfs_init_new_inode( > * ID or one of the supplementary group IDs, the S_ISGID bit is cleared > * (and only if the irix_sgid_inherit compatibility variable is set). > */ > - if (irix_sgid_inherit && > - (inode->i_mode & S_ISGID) && > - !in_group_p(i_gid_into_mnt(mnt_userns, inode))) > + if (irix_sgid_inherit && (inode->i_mode & S_ISGID) && > + !vfsgid_in_group_p(i_gid_into_vfsgid(mnt_userns, inode))) > inode->i_mode &= ~S_ISGID; > > ip->i_disk_size = 0; > diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c > index 45518b8c613c..5d670c85dcc2 100644 > --- a/fs/xfs/xfs_iops.c > +++ b/fs/xfs/xfs_iops.c > @@ -558,6 +558,8 @@ xfs_vn_getattr( > struct inode *inode = d_inode(path->dentry); > struct xfs_inode *ip = XFS_I(inode); > struct xfs_mount *mp = ip->i_mount; > + vfsuid_t vfsuid = i_uid_into_vfsuid(mnt_userns, inode); > + vfsgid_t vfsgid = i_gid_into_vfsgid(mnt_userns, inode); > > trace_xfs_getattr(ip); > > @@ -568,8 +570,8 @@ xfs_vn_getattr( > stat->dev = inode->i_sb->s_dev; > stat->mode = inode->i_mode; > stat->nlink = inode->i_nlink; > - stat->uid = i_uid_into_mnt(mnt_userns, inode); > - stat->gid = i_gid_into_mnt(mnt_userns, inode); > + stat->uid = vfsuid_into_kuid(vfsuid); > + stat->gid = vfsgid_into_kgid(vfsgid); > stat->ino = ip->i_ino; > stat->atime = inode->i_atime; > stat->mtime = inode->i_mtime; > diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c > index 36312b00b164..a1c2bcf65d37 100644 > --- a/fs/xfs/xfs_itable.c > +++ b/fs/xfs/xfs_itable.c > @@ -66,6 +66,8 @@ xfs_bulkstat_one_int( > struct xfs_bulkstat *buf = bc->buf; > xfs_extnum_t nextents; > int error = -EINVAL; > + vfsuid_t vfsuid; > + vfsgid_t vfsgid; > > if (xfs_internal_inum(mp, ino)) > goto out_advance; > @@ -81,14 +83,16 @@ xfs_bulkstat_one_int( > ASSERT(ip != NULL); > ASSERT(ip->i_imap.im_blkno != 0); > inode = VFS_I(ip); > + vfsuid = i_uid_into_vfsuid(mnt_userns, inode); > + vfsgid = i_gid_into_vfsgid(mnt_userns, inode); > > /* xfs_iget returns the following without needing > * further change. > */ > buf->bs_projectid = ip->i_projid; > buf->bs_ino = ino; > - buf->bs_uid = from_kuid(sb_userns, i_uid_into_mnt(mnt_userns, inode)); > - buf->bs_gid = from_kgid(sb_userns, i_gid_into_mnt(mnt_userns, inode)); > + buf->bs_uid = from_kuid(sb_userns, vfsuid_into_kuid(vfsuid)); > + buf->bs_gid = from_kgid(sb_userns, vfsgid_into_kgid(vfsgid)); So we convert i_uid into vfsguid into kuid into the user space visible one here. I wonder if there is any good short cut, as reading this chaing feels odd. But I guess that's what we get for a non-VFS ioctl interface exposint uids/gids.