From: Jan Kara <jack@suse.cz> To: <linux-fsdevel@vger.kernel.org> Cc: Andreas Gruenbacher <agruenba@redhat.com>, Jan Kara <jack@suse.cz>, stable@vger.kernel.org, reiserfs-devel@vger.kernel.org Subject: [PATCH 10/11] reiserfs: Don't clear SGID when inheriting ACLs Date: Thu, 22 Jun 2017 15:31:14 +0200 [thread overview] Message-ID: <20170622133115.16968-11-jack@suse.cz> (raw) In-Reply-To: <20170622133115.16968-1-jack@suse.cz> When new directory 'DIR1' is created in a directory 'DIR0' with SGID bit set, DIR1 is expected to have SGID bit set (and owning group equal to the owning group of 'DIR0'). However when 'DIR0' also has some default ACLs that 'DIR1' inherits, setting these ACLs will result in SGID bit on 'DIR1' to get cleared if user is not member of the owning group. Fix the problem by moving posix_acl_update_mode() out of __reiserfs_set_acl() into reiserfs_set_acl(). That way the function will not be called when inheriting ACLs which is what we want as it prevents SGID bit clearing and the mode has been properly set by posix_acl_create() anyway. Fixes: 073931017b49d9458aa351605b43a7e34598caef CC: stable@vger.kernel.org CC: reiserfs-devel@vger.kernel.org Signed-off-by: Jan Kara <jack@suse.cz> --- fs/reiserfs/xattr_acl.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/fs/reiserfs/xattr_acl.c b/fs/reiserfs/xattr_acl.c index 3d2256a425ee..d92a1dc6ee70 100644 --- a/fs/reiserfs/xattr_acl.c +++ b/fs/reiserfs/xattr_acl.c @@ -37,7 +37,14 @@ reiserfs_set_acl(struct inode *inode, struct posix_acl *acl, int type) error = journal_begin(&th, inode->i_sb, jcreate_blocks); reiserfs_write_unlock(inode->i_sb); if (error == 0) { + if (type == ACL_TYPE_ACCESS && acl) { + error = posix_acl_update_mode(inode, &inode->i_mode, + &acl); + if (error) + goto unlock; + } error = __reiserfs_set_acl(&th, inode, type, acl); +unlock: reiserfs_write_lock(inode->i_sb); error2 = journal_end(&th); reiserfs_write_unlock(inode->i_sb); @@ -241,11 +248,6 @@ __reiserfs_set_acl(struct reiserfs_transaction_handle *th, struct inode *inode, switch (type) { case ACL_TYPE_ACCESS: name = XATTR_NAME_POSIX_ACL_ACCESS; - if (acl) { - error = posix_acl_update_mode(inode, &inode->i_mode, &acl); - if (error) - return error; - } break; case ACL_TYPE_DEFAULT: name = XATTR_NAME_POSIX_ACL_DEFAULT; -- 2.12.3
WARNING: multiple messages have this Message-ID (diff)
From: Jan Kara <jack@suse.cz> To: linux-fsdevel@vger.kernel.org Cc: Andreas Gruenbacher <agruenba@redhat.com>, Jan Kara <jack@suse.cz>, stable@vger.kernel.org, reiserfs-devel@vger.kernel.org Subject: [PATCH 10/11] reiserfs: Don't clear SGID when inheriting ACLs Date: Thu, 22 Jun 2017 15:31:14 +0200 [thread overview] Message-ID: <20170622133115.16968-11-jack@suse.cz> (raw) In-Reply-To: <20170622133115.16968-1-jack@suse.cz> When new directory 'DIR1' is created in a directory 'DIR0' with SGID bit set, DIR1 is expected to have SGID bit set (and owning group equal to the owning group of 'DIR0'). However when 'DIR0' also has some default ACLs that 'DIR1' inherits, setting these ACLs will result in SGID bit on 'DIR1' to get cleared if user is not member of the owning group. Fix the problem by moving posix_acl_update_mode() out of __reiserfs_set_acl() into reiserfs_set_acl(). That way the function will not be called when inheriting ACLs which is what we want as it prevents SGID bit clearing and the mode has been properly set by posix_acl_create() anyway. Fixes: 073931017b49d9458aa351605b43a7e34598caef CC: stable@vger.kernel.org CC: reiserfs-devel@vger.kernel.org Signed-off-by: Jan Kara <jack@suse.cz> --- fs/reiserfs/xattr_acl.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/fs/reiserfs/xattr_acl.c b/fs/reiserfs/xattr_acl.c index 3d2256a425ee..d92a1dc6ee70 100644 --- a/fs/reiserfs/xattr_acl.c +++ b/fs/reiserfs/xattr_acl.c @@ -37,7 +37,14 @@ reiserfs_set_acl(struct inode *inode, struct posix_acl *acl, int type) error = journal_begin(&th, inode->i_sb, jcreate_blocks); reiserfs_write_unlock(inode->i_sb); if (error == 0) { + if (type == ACL_TYPE_ACCESS && acl) { + error = posix_acl_update_mode(inode, &inode->i_mode, + &acl); + if (error) + goto unlock; + } error = __reiserfs_set_acl(&th, inode, type, acl); +unlock: reiserfs_write_lock(inode->i_sb); error2 = journal_end(&th); reiserfs_write_unlock(inode->i_sb); @@ -241,11 +248,6 @@ __reiserfs_set_acl(struct reiserfs_transaction_handle *th, struct inode *inode, switch (type) { case ACL_TYPE_ACCESS: name = XATTR_NAME_POSIX_ACL_ACCESS; - if (acl) { - error = posix_acl_update_mode(inode, &inode->i_mode, &acl); - if (error) - return error; - } break; case ACL_TYPE_DEFAULT: name = XATTR_NAME_POSIX_ACL_DEFAULT; -- 2.12.3
next prev parent reply other threads:[~2017-06-22 13:31 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-06-22 13:31 [PATCH 0/11 v1] Fix inheritance of SGID in presence of default ACLs Jan Kara 2017-06-22 13:31 ` Jan Kara 2017-06-22 13:31 ` [Cluster-devel] " Jan Kara 2017-06-22 13:31 ` [Ocfs2-devel] " Jan Kara 2017-06-22 13:31 ` Jan Kara 2017-06-22 13:31 ` Jan Kara 2017-06-22 13:31 ` [PATCH 01/11] ext4: Don't clear SGID when inheriting ACLs Jan Kara 2017-06-22 15:32 ` Andreas Gruenbacher 2017-07-18 16:16 ` Jan Kara 2017-07-31 3:34 ` Theodore Ts'o 2017-06-22 13:31 ` [PATCH 02/11] ext2: " Jan Kara 2017-06-22 13:31 ` [PATCH 03/11] btrfs: " Jan Kara 2017-06-26 16:47 ` David Sterba 2017-06-22 13:31 ` [PATCH 04/11] gfs2: " Jan Kara 2017-06-22 13:31 ` [Cluster-devel] " Jan Kara 2017-07-18 16:18 ` Jan Kara 2017-07-18 16:18 ` [Cluster-devel] " Jan Kara 2017-07-19 16:17 ` Bob Peterson 2017-07-19 16:17 ` [Cluster-devel] " Bob Peterson 2017-06-22 13:31 ` [PATCH 05/11] hfsplus: " Jan Kara 2017-06-22 13:31 ` [PATCH 06/11] jfs: " Jan Kara 2017-07-18 16:19 ` Jan Kara 2017-07-18 17:36 ` Dave Kleikamp 2017-06-22 13:31 ` [PATCH 07/11] ocfs2: Make ocfs2_set_acl() static Jan Kara 2017-06-22 13:31 ` [Ocfs2-devel] " Jan Kara 2017-06-22 13:31 ` [PATCH 08/11] ocfs2: Don't clear SGID when inheriting ACLs Jan Kara 2017-06-22 13:31 ` [Ocfs2-devel] " Jan Kara 2017-06-22 13:31 ` [PATCH 09/11] orangefs: " Jan Kara 2017-07-18 16:18 ` Jan Kara 2017-07-20 16:05 ` Mike Marshall 2017-07-20 16:27 ` Jan Kara 2017-06-22 13:31 ` Jan Kara [this message] 2017-06-22 13:31 ` [PATCH 10/11] reiserfs: " Jan Kara 2017-06-22 13:31 ` [PATCH 11/11] xfs: " Jan Kara 2017-06-22 13:31 ` Jan Kara 2017-06-26 15:52 ` Darrick J. Wong
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170622133115.16968-11-jack@suse.cz \ --to=jack@suse.cz \ --cc=agruenba@redhat.com \ --cc=linux-fsdevel@vger.kernel.org \ --cc=reiserfs-devel@vger.kernel.org \ --cc=stable@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.