From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.suse.de ([195.135.220.15]:55561 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755595AbdAJIDE (ORCPT ); Tue, 10 Jan 2017 03:03:04 -0500 Date: Tue, 10 Jan 2017 09:03:01 +0100 From: Jan Kara To: viro@zeniv.linux.org.uk Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, zhaohongjiang@huawei.com, miaoxie@huawei.com, jack@suse.cz, Gu Zheng Subject: Re: [PATCH] tmpfs: clear S_ISGID when setting posix ACLs Message-ID: <20170110080301.GA32191@quack2.suse.cz> References: <1483925688-8233-1-git-send-email-guzheng1@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1483925688-8233-1-git-send-email-guzheng1@huawei.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: On Mon 09-01-17 09:34:48, Gu Zheng wrote: > This change was missed the tmpfs modification in In CVE-2016-7097 > commit 073931017b49 ("posix_acl: Clear SGID bit when setting > file permissions") > It can test by xfstest generic/375, which failed to clear > setgid bit in the following test case on tmpfs: > > touch $testfile > chown 100:100 $testfile > chmod 2755 $testfile > _runas -u 100 -g 101 -- setfacl -m u::rwx,g::rwx,o::rwx $testfile > > Signed-off-by: Gu Zheng Thanks. The patch looks good. You can add: Reviewed-by: Jan Kara Al, will you please merge it? Thanks! Honza > --- > fs/posix_acl.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/fs/posix_acl.c b/fs/posix_acl.c > index 5955220..d014dff 100644 > --- a/fs/posix_acl.c > +++ b/fs/posix_acl.c > @@ -922,11 +922,10 @@ int simple_set_acl(struct inode *inode, struct posix_acl *acl, int type) > int error; > > if (type == ACL_TYPE_ACCESS) { > - error = posix_acl_equiv_mode(acl, &inode->i_mode); > - if (error < 0) > - return 0; > - if (error == 0) > - acl = NULL; > + error = posix_acl_update_mode(inode, > + &inode->i_mode, &acl); > + if (error) > + return error; > } > > inode->i_ctime = current_time(inode); > -- > 2.5.0 > -- Jan Kara SUSE Labs, CR