From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail1.bemta32.messagelabs.com (mail1.bemta32.messagelabs.com [195.245.230.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 693B3ED4 for ; Tue, 19 Apr 2022 10:46:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fujitsu.com; s=170520fj; t=1650365198; i=@fujitsu.com; bh=nKcbw9G10YRwJtuTkWKrJxPtCYxkjd1NLjOt968HcKM=; h=From:To:CC:Subject:Date:Message-ID:MIME-Version:Content-Type; b=FtukdF7buVA7kfo1MC9GCqe2FA/iAKQnj7RcQrpOn9pKeTatldHlqxERZAtqaKDgh PLKlmPoUOMEz1nBrxNm9t/youJkNGcdT1D9IxMmHfP7SydwrknrB0+z3T80DI2oUk6 OqS+YTCjKQ1XkCyJMGQcb74E3Rfzsme7Ls6SxHD4S70pfHoJpLJ6sby7REdzeAV5UW xmRv5yqZCxV70WTms/aAPGDxpcEPGVdakI+XeNYrRrymX9BNodUJYOYnL1FUlL0GPd ES9aKpcVmHedXk64fLxVKuC4/Nm93dbORwKOYDlbAfwEVy7r3xmTyuo7iMayAqHxrL nbHmmPyKD8dXA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrPIsWRWlGSWpSXmKPExsViZ8MxSZd3cly SwbH9phavD39itPhwcxKTxempZ5ksthy7x2hx+Qmfxc9lq9gtLi1yt9iz9ySLxYUDp1ktdv3Z wW6x8vFWJovzf4+zOvB4nFok4bFpVSebx4vNMxk9di/4zOTxeZOcx6Ynb5kC2KJYM/OS8isSW DM62rULpgpVdJx+zt7AuIq/i5GLQ0hgC6PEtmM3WSGcBUwScz++YIZw9jBKPPm3hLGLkZODTU BT4lnnAmYQW0RAWWLBjWNsIEXMAmeYJC5dgygSFkiUOHv6ACuIzSKgKnHjQx9YnFfAQ6LhSx9 YXEJAQWLKw/fMEHFBiZMzn7CA2MwCEhIHX7xghqhRlLjU8Y0Rwq6QmDWrjQnCVpO4em4T8wRG /llI2mchaV/AyLSK0SqpKDM9oyQ3MTNH19DAQNfQ0FTXQNfIxFgvsUo3US+1VLc8tbhE11Avs bxYL7W4WK+4Mjc5J0UvL7VkEyMwXlKKGT7vYFzQ91PvEKMkB5OSKG99VFySEF9SfkplRmJxRn xRaU5q8SFGGQ4OJQne0glAOcGi1PTUirTMHGDswqQlOHiURHgn9wOleYsLEnOLM9MhUqcYFaX EecVagBICIImM0jy4Nli6uMQoKyXMy8jAwCDEU5BalJtZgir/ilGcg1FJmLdpItAUnsy8Erjp r4AWMwEtrp4SC7K4JBEhJdXAlG0x47WhXXPmhOZX25cXbJ/22zNIXuVX1Rr1zBk/LzkUiB/Zl PQzzPpcf0Czsuf21pzcfpHZPJPW7Pi1XE1yYsHb96E/e+ZveLJiRsd7h+IF1pPU7shLvNffM+ Olh9urBQWFR5i2/d/ie5xdS4L12ft9zPnLl794xf5MN3frp64bp+Mem0iL7HHgE8rUm2JtvH3 VKz391Tvt3tY+mNnt1PktKVklxjYg+GSnmh/7vOM7+Y4+5cu62/THvyEj7J0Nt3DgjSdn8nJW yvAd3BYs2Kl0KXfaVVn1yO6l84PLs9Pe1CWdf56yYvOOcxs5/9ycn3HgiVjL28fzbJ03XFHMf TZPP/FhX9KuNpXt2W0GjUosxRmJhlrMRcWJABJQCauSAwAA X-Env-Sender: xuyang2018.jy@fujitsu.com X-Msg-Ref: server-6.tower-587.messagelabs.com!1650365197!269511!1 X-Originating-IP: [62.60.8.146] X-SYMC-ESS-Client-Auth: outbound-route-from=pass X-StarScan-Received: X-StarScan-Version: 9.85.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19231 invoked from network); 19 Apr 2022 10:46:37 -0000 Received: from unknown (HELO n03ukasimr02.n03.fujitsu.local) (62.60.8.146) by server-6.tower-587.messagelabs.com with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 19 Apr 2022 10:46:37 -0000 Received: from n03ukasimr02.n03.fujitsu.local (localhost [127.0.0.1]) by n03ukasimr02.n03.fujitsu.local (Postfix) with ESMTP id 29D4210045A; Tue, 19 Apr 2022 11:46:37 +0100 (BST) Received: from R01UKEXCASM126.r01.fujitsu.local (unknown [10.183.43.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by n03ukasimr02.n03.fujitsu.local (Postfix) with ESMTPS id 17C58100440; Tue, 19 Apr 2022 11:46:37 +0100 (BST) Received: from localhost.localdomain (10.167.220.84) by R01UKEXCASM126.r01.fujitsu.local (10.183.43.178) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Tue, 19 Apr 2022 11:46:11 +0100 From: Yang Xu To: CC: , , , , , , , , , , , Yang Xu Subject: [PATCH v4 1/8] fs: move sgid strip operation from inode_init_owner into inode_sgid_strip Date: Tue, 19 Apr 2022 19:47:07 +0800 Message-ID: <1650368834-2420-1-git-send-email-xuyang2018.jy@fujitsu.com> X-Mailer: git-send-email 1.8.3.1 Precedence: bulk X-Mailing-List: ntfs3@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.167.220.84] X-ClientProxiedBy: G08CNEXCHPEKD07.g08.fujitsu.local (10.167.33.80) To R01UKEXCASM126.r01.fujitsu.local (10.183.43.178) X-Virus-Scanned: ClamAV using ClamSMTP This has no functional change. Just create and export inode_sgid_strip api for the subsequent patch. This function is used to strip S_ISGID mode when init a new inode. Acked-by: Christian Brauner (Microsoft) Signed-off-by: Yang Xu --- fs/inode.c | 22 ++++++++++++++++++---- include/linux/fs.h | 3 ++- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/fs/inode.c b/fs/inode.c index 9d9b422504d1..3215e61a0021 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -2246,10 +2246,8 @@ void inode_init_owner(struct user_namespace *mnt_userns, struct inode *inode, /* Directories are special, and always inherit S_ISGID */ if (S_ISDIR(mode)) mode |= S_ISGID; - else if ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP) && - !in_group_p(i_gid_into_mnt(mnt_userns, dir)) && - !capable_wrt_inode_uidgid(mnt_userns, dir, CAP_FSETID)) - mode &= ~S_ISGID; + else + inode_sgid_strip(mnt_userns, dir, &mode); } else inode_fsgid_set(inode, mnt_userns); inode->i_mode = mode; @@ -2405,3 +2403,19 @@ struct timespec64 current_time(struct inode *inode) return timestamp_truncate(now, inode); } EXPORT_SYMBOL(current_time); + +void inode_sgid_strip(struct user_namespace *mnt_userns, + const struct inode *dir, umode_t *mode) +{ + if (S_ISDIR(*mode) || !dir || !(dir->i_mode & S_ISGID)) + return; + if ((*mode & (S_ISGID | S_IXGRP)) != (S_ISGID | S_IXGRP)) + return; + if (in_group_p(i_gid_into_mnt(mnt_userns, dir))) + return; + if (capable_wrt_inode_uidgid(mnt_userns, dir, CAP_FSETID)) + return; + + *mode &= ~S_ISGID; +} +EXPORT_SYMBOL(inode_sgid_strip); diff --git a/include/linux/fs.h b/include/linux/fs.h index bbde95387a23..4a617aaab6f6 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1897,7 +1897,8 @@ extern long compat_ptr_ioctl(struct file *file, unsigned int cmd, void inode_init_owner(struct user_namespace *mnt_userns, struct inode *inode, const struct inode *dir, umode_t mode); extern bool may_open_dev(const struct path *path); - +void inode_sgid_strip(struct user_namespace *mnt_userns, + const struct inode *dir, umode_t *mode); /* * This is the "filldir" function type, used by readdir() to let * the kernel specify what kind of dirent layout it wants to have. -- 2.27.0 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 lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B168FC433F5 for ; Tue, 19 Apr 2022 11:00:53 +0000 (UTC) Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.94.2) (envelope-from ) id 1nglbF-0004fM-RG; Tue, 19 Apr 2022 11:00:50 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nglbF-0004fE-07 for linux-f2fs-devel@lists.sourceforge.net; Tue, 19 Apr 2022 11:00:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Type:MIME-Version:Message-ID:Date:Subject: CC:To:From:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=nKcbw9G10YRwJtuTkWKrJxPtCYxkjd1NLjOt968HcKM=; b=NwHMKX+UunnSYxPqBOg6Q7Jk4W DzJ0rH9DTHI+HUU3IXgf0ONHcu08CxLusbhypVh3X+s0e8aHIgqQR0QnAkSx6O4JMvxUsAdPwRLtr VrTtCB3Xu80oNCNjylDaEmIJqLKzXoJHDW6gGYSwiO5oY/da/9lGIIzVP2WSkxrDluU4=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Type:MIME-Version:Message-ID:Date:Subject:CC:To:From:Sender: Reply-To:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date :Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=nKcbw9G10YRwJtuTkWKrJxPtCYxkjd1NLjOt968HcKM=; b=T uq1Hnq6Ov936DUyvbyEult5HYE32ZXNf3FzzVDZ2gDp4bcDCFBgn89vCYKllqoGyIhc7WpQDq/vyy pLkqDF6uzOTEtI9RiYibqJ0Smxlb1WGbDlc8tNVquEg+Mhx9N43HOxVfn+3hFgnMMFAqx9Yha5Mzd sa7Qt9qe5gBHjQ+Y=; Received: from mail1.bemta32.messagelabs.com ([195.245.230.1]) by sfi-mx-2.v28.lw.sourceforge.com with esmtp (Exim 4.94.2) id 1nglbA-00065K-Kt for linux-f2fs-devel@lists.sourceforge.net; Tue, 19 Apr 2022 11:00:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fujitsu.com; s=170520fj; t=1650365198; i=@fujitsu.com; bh=nKcbw9G10YRwJtuTkWKrJxPtCYxkjd1NLjOt968HcKM=; h=From:To:CC:Subject:Date:Message-ID:MIME-Version:Content-Type; b=FtukdF7buVA7kfo1MC9GCqe2FA/iAKQnj7RcQrpOn9pKeTatldHlqxERZAtqaKDgh PLKlmPoUOMEz1nBrxNm9t/youJkNGcdT1D9IxMmHfP7SydwrknrB0+z3T80DI2oUk6 OqS+YTCjKQ1XkCyJMGQcb74E3Rfzsme7Ls6SxHD4S70pfHoJpLJ6sby7REdzeAV5UW xmRv5yqZCxV70WTms/aAPGDxpcEPGVdakI+XeNYrRrymX9BNodUJYOYnL1FUlL0GPd ES9aKpcVmHedXk64fLxVKuC4/Nm93dbORwKOYDlbAfwEVy7r3xmTyuo7iMayAqHxrL nbHmmPyKD8dXA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrPIsWRWlGSWpSXmKPExsViZ8MxSZd3cly SwbH9phavD39itPhwcxKTxempZ5ksthy7x2hx+Qmfxc9lq9gtLi1yt9iz9ySLxYUDp1ktdv3Z wW6x8vFWJovzf4+zOvB4nFok4bFpVSebx4vNMxk9di/4zOTxeZOcx6Ynb5kC2KJYM/OS8isSW DM62rULpgpVdJx+zt7AuIq/i5GLQ0hgC6PEtmM3WSGcBUwScz++YIZw9jBKPPm3hLGLkZODTU BT4lnnAmYQW0RAWWLBjWNsIEXMAmeYJC5dgygSFkiUOHv6ACuIzSKgKnHjQx9YnFfAQ6LhSx9 YXEJAQWLKw/fMEHFBiZMzn7CA2MwCEhIHX7xghqhRlLjU8Y0Rwq6QmDWrjQnCVpO4em4T8wRG /llI2mchaV/AyLSK0SqpKDM9oyQ3MTNH19DAQNfQ0FTXQNfIxFgvsUo3US+1VLc8tbhE11Avs bxYL7W4WK+4Mjc5J0UvL7VkEyMwXlKKGT7vYFzQ91PvEKMkB5OSKG99VFySEF9SfkplRmJxRn xRaU5q8SFGGQ4OJQne0glAOcGi1PTUirTMHGDswqQlOHiURHgn9wOleYsLEnOLM9MhUqcYFaX EecVagBICIImM0jy4Nli6uMQoKyXMy8jAwCDEU5BalJtZgir/ilGcg1FJmLdpItAUnsy8Erjp r4AWMwEtrp4SC7K4JBEhJdXAlG0x47WhXXPmhOZX25cXbJ/22zNIXuVX1Rr1zBk/LzkUiB/Zl PQzzPpcf0Czsuf21pzcfpHZPJPW7Pi1XE1yYsHb96E/e+ZveLJiRsd7h+IF1pPU7shLvNffM+ Olh9urBQWFR5i2/d/ie5xdS4L12ft9zPnLl794xf5MN3frp64bp+Mem0iL7HHgE8rUm2JtvH3 VKz391Tvt3tY+mNnt1PktKVklxjYg+GSnmh/7vOM7+Y4+5cu62/THvyEj7J0Nt3DgjSdn8nJW yvAd3BYs2Kl0KXfaVVn1yO6l84PLs9Pe1CWdf56yYvOOcxs5/9ycn3HgiVjL28fzbJ03XFHMf TZPP/FhX9KuNpXt2W0GjUosxRmJhlrMRcWJABJQCauSAwAA X-Env-Sender: xuyang2018.jy@fujitsu.com X-Msg-Ref: server-6.tower-587.messagelabs.com!1650365197!269511!1 X-Originating-IP: [62.60.8.146] X-SYMC-ESS-Client-Auth: outbound-route-from=pass X-StarScan-Received: X-StarScan-Version: 9.85.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19231 invoked from network); 19 Apr 2022 10:46:37 -0000 Received: from unknown (HELO n03ukasimr02.n03.fujitsu.local) (62.60.8.146) by server-6.tower-587.messagelabs.com with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 19 Apr 2022 10:46:37 -0000 Received: from n03ukasimr02.n03.fujitsu.local (localhost [127.0.0.1]) by n03ukasimr02.n03.fujitsu.local (Postfix) with ESMTP id 29D4210045A; Tue, 19 Apr 2022 11:46:37 +0100 (BST) Received: from R01UKEXCASM126.r01.fujitsu.local (unknown [10.183.43.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by n03ukasimr02.n03.fujitsu.local (Postfix) with ESMTPS id 17C58100440; Tue, 19 Apr 2022 11:46:37 +0100 (BST) Received: from localhost.localdomain (10.167.220.84) by R01UKEXCASM126.r01.fujitsu.local (10.183.43.178) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Tue, 19 Apr 2022 11:46:11 +0100 From: Yang Xu To: Date: Tue, 19 Apr 2022 19:47:07 +0800 Message-ID: <1650368834-2420-1-git-send-email-xuyang2018.jy@fujitsu.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Originating-IP: [10.167.220.84] X-ClientProxiedBy: G08CNEXCHPEKD07.g08.fujitsu.local (10.167.33.80) To R01UKEXCASM126.r01.fujitsu.local (10.183.43.178) X-Virus-Scanned: ClamAV using ClamSMTP X-Headers-End: 1nglbA-00065K-Kt Subject: [f2fs-dev] [PATCH v4 1/8] fs: move sgid strip operation from inode_init_owner into inode_sgid_strip X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-nfs@vger.kernel.org, Yang Xu , djwong@kernel.org, david@fromorbit.com, brauner@kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-xfs@vger.kernel.org, viro@zeniv.linux.org.uk, jlayton@kernel.org, ceph-devel@vger.kernel.org, ntfs3@lists.linux.dev Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net This has no functional change. Just create and export inode_sgid_strip api for the subsequent patch. This function is used to strip S_ISGID mode when init a new inode. Acked-by: Christian Brauner (Microsoft) Signed-off-by: Yang Xu --- fs/inode.c | 22 ++++++++++++++++++---- include/linux/fs.h | 3 ++- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/fs/inode.c b/fs/inode.c index 9d9b422504d1..3215e61a0021 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -2246,10 +2246,8 @@ void inode_init_owner(struct user_namespace *mnt_userns, struct inode *inode, /* Directories are special, and always inherit S_ISGID */ if (S_ISDIR(mode)) mode |= S_ISGID; - else if ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP) && - !in_group_p(i_gid_into_mnt(mnt_userns, dir)) && - !capable_wrt_inode_uidgid(mnt_userns, dir, CAP_FSETID)) - mode &= ~S_ISGID; + else + inode_sgid_strip(mnt_userns, dir, &mode); } else inode_fsgid_set(inode, mnt_userns); inode->i_mode = mode; @@ -2405,3 +2403,19 @@ struct timespec64 current_time(struct inode *inode) return timestamp_truncate(now, inode); } EXPORT_SYMBOL(current_time); + +void inode_sgid_strip(struct user_namespace *mnt_userns, + const struct inode *dir, umode_t *mode) +{ + if (S_ISDIR(*mode) || !dir || !(dir->i_mode & S_ISGID)) + return; + if ((*mode & (S_ISGID | S_IXGRP)) != (S_ISGID | S_IXGRP)) + return; + if (in_group_p(i_gid_into_mnt(mnt_userns, dir))) + return; + if (capable_wrt_inode_uidgid(mnt_userns, dir, CAP_FSETID)) + return; + + *mode &= ~S_ISGID; +} +EXPORT_SYMBOL(inode_sgid_strip); diff --git a/include/linux/fs.h b/include/linux/fs.h index bbde95387a23..4a617aaab6f6 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1897,7 +1897,8 @@ extern long compat_ptr_ioctl(struct file *file, unsigned int cmd, void inode_init_owner(struct user_namespace *mnt_userns, struct inode *inode, const struct inode *dir, umode_t mode); extern bool may_open_dev(const struct path *path); - +void inode_sgid_strip(struct user_namespace *mnt_userns, + const struct inode *dir, umode_t *mode); /* * This is the "filldir" function type, used by readdir() to let * the kernel specify what kind of dirent layout it wants to have. -- 2.27.0 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel