From patchwork Tue Aug 8 12:44:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kara X-Patchwork-Id: 799154 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xRYyG71c6z9s8J for ; Tue, 8 Aug 2017 22:44:54 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752030AbdHHMot (ORCPT ); Tue, 8 Aug 2017 08:44:49 -0400 Received: from mx2.suse.de ([195.135.220.15]:50208 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751925AbdHHMos (ORCPT ); Tue, 8 Aug 2017 08:44:48 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 6ED39AEAF; Tue, 8 Aug 2017 12:44:47 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id 0C1E51E3421; Tue, 8 Aug 2017 14:44:46 +0200 (CEST) From: Jan Kara To: stable@vger.kernel.org Cc: Ted Tso , , gregkh@linuxfoundation.org, Jan Kara Subject: [PATCH] ext4: Don't clear SGID when inheriting ACLs Date: Tue, 8 Aug 2017 14:44:42 +0200 Message-Id: <20170808124442.8963-3-jack@suse.cz> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20170808124442.8963-1-jack@suse.cz> References: <20170808124442.8963-1-jack@suse.cz> Git-commit: a3bb2d5587521eea6dab2d05326abb0afb460abd Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org 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 __ext4_set_acl() into ext4_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 Signed-off-by: Theodore Ts'o Signed-off-by: Jan Kara Reviewed-by: Andreas Gruenbacher --- fs/ext4/acl.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) --- a/fs/ext4/acl.c +++ b/fs/ext4/acl.c @@ -189,18 +189,10 @@ __ext4_set_acl(handle_t *handle, struct void *value = NULL; size_t size = 0; int error; - int update_mode = 0; - umode_t mode = inode->i_mode; switch (type) { case ACL_TYPE_ACCESS: name_index = EXT4_XATTR_INDEX_POSIX_ACL_ACCESS; - if (acl) { - error = posix_acl_update_mode(inode, &mode, &acl); - if (error) - return error; - update_mode = 1; - } break; case ACL_TYPE_DEFAULT: @@ -224,11 +216,6 @@ __ext4_set_acl(handle_t *handle, struct kfree(value); if (!error) { set_cached_acl(inode, type, acl); - if (update_mode) { - inode->i_mode = mode; - inode->i_ctime = current_time(inode); - ext4_mark_inode_dirty(handle, inode); - } } return error; @@ -239,6 +226,8 @@ ext4_set_acl(struct inode *inode, struct { handle_t *handle; int error, retries = 0; + umode_t mode = inode->i_mode; + int update_mode = 0; error = dquot_initialize(inode); if (error) @@ -249,7 +238,20 @@ retry: if (IS_ERR(handle)) return PTR_ERR(handle); + if ((type == ACL_TYPE_ACCESS) && acl) { + error = posix_acl_update_mode(inode, &mode, &acl); + if (error) + goto out_stop; + update_mode = 1; + } + error = __ext4_set_acl(handle, inode, type, acl); + if (!error && update_mode) { + inode->i_mode = mode; + inode->i_ctime = current_time(inode); + ext4_mark_inode_dirty(handle, inode); + } +out_stop: ext4_journal_stop(handle); if (error == -ENOSPC && ext4_should_retry_alloc(inode->i_sb, &retries)) goto retry;