On 7.03.2018 09:57, Nikolay Borisov wrote:
> From: Jan Kara <jack@xxxxxxx>
>
> 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
> __btrfs_set_acl() into btrfs_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@xxxxxxxxxxxxxxx
> CC: linux-btrfs@xxxxxxxxxxxxxxx
> CC: David Sterba <dsterba@xxxxxxxx>
> Signed-off-by: Jan Kara <jack@xxxxxxx>
> Signed-off-by: David Sterba <dsterba@xxxxxxxx>
> Signed-off-by: Nikolay Borisov <nborisov@xxxxxxxx>
> ---
Geez, forgot to add the in-reply-to for proper threading. Anyways, those
are the two backports I emailed you yesterday about.
> fs/btrfs/acl.c | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
> index fb3e64d37cb4..233bbc8789e0 100644
> --- a/fs/btrfs/acl.c
> +++ b/fs/btrfs/acl.c
> @@ -82,12 +82,6 @@ static int __btrfs_set_acl(struct btrfs_trans_handle *trans,
> switch (type) {
> case ACL_TYPE_ACCESS:
> name = POSIX_ACL_XATTR_ACCESS;
> - if (acl) {
> - ret = posix_acl_update_mode(inode, &inode->i_mode, &acl);
> - if (ret)
> - return ret;
> - }
> - ret = 0;
> break;
> case ACL_TYPE_DEFAULT:
> if (!S_ISDIR(inode->i_mode))
> @@ -123,6 +117,13 @@ static int __btrfs_set_acl(struct btrfs_trans_handle *trans,
>
> int btrfs_set_acl(struct inode *inode, struct posix_acl *acl, int type)
> {
> + int ret;
> +
> + if (type == ACL_TYPE_ACCESS && acl) {
> + ret = posix_acl_update_mode(inode, &inode->i_mode, &acl);
> + if (ret)
> + return ret;
> + }
> return __btrfs_set_acl(NULL, inode, acl, type);
> }
>
>