* [PATCH] tmpfs: clear S_ISGID when setting posix ACLs
@ 2017-01-09 1:34 Gu Zheng
2017-01-10 8:03 ` Jan Kara
0 siblings, 1 reply; 6+ messages in thread
From: Gu Zheng @ 2017-01-09 1:34 UTC (permalink / raw)
To: linux-fsdevel, linux-kernel; +Cc: guzheng1, zhaohongjiang, miaoxie, viro, jack
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 <guzheng1@huawei.com>
---
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] tmpfs: clear S_ISGID when setting posix ACLs
2017-01-09 1:34 [PATCH] tmpfs: clear S_ISGID when setting posix ACLs Gu Zheng
@ 2017-01-10 8:03 ` Jan Kara
2017-01-10 8:12 ` Al Viro
0 siblings, 1 reply; 6+ messages in thread
From: Jan Kara @ 2017-01-10 8:03 UTC (permalink / raw)
To: viro; +Cc: linux-fsdevel, linux-kernel, zhaohongjiang, miaoxie, jack,
Gu Zheng
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 <guzheng1@huawei.com>
Thanks. The patch looks good. You can add:
Reviewed-by: Jan Kara <jack@suse.cz>
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 <jack@suse.com>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] tmpfs: clear S_ISGID when setting posix ACLs
2017-01-10 8:03 ` Jan Kara
@ 2017-01-10 8:12 ` Al Viro
0 siblings, 0 replies; 6+ messages in thread
From: Al Viro @ 2017-01-10 8:12 UTC (permalink / raw)
To: Jan Kara; +Cc: linux-fsdevel, linux-kernel, zhaohongjiang, miaoxie, Gu Zheng
On Tue, Jan 10, 2017 at 09:03:01AM +0100, Jan Kara wrote:
> 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 <guzheng1@huawei.com>
>
> Thanks. The patch looks good. You can add:
>
> Reviewed-by: Jan Kara <jack@suse.cz>
>
> Al, will you please merge it? Thanks!
Already applied, actually...
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] tmpfs: clear S_ISGID when setting posix ACLs
@ 2017-01-06 8:12 Gu Zheng
2017-01-06 10:10 ` Jan Kara
0 siblings, 1 reply; 6+ messages in thread
From: Gu Zheng @ 2017-01-06 8:12 UTC (permalink / raw)
To: linux-fsdevel, linux-kernel; +Cc: viro, jack
This change was missed the tmpfs modification in In CVE-2016-7097
commit 073931017b49d9458aa351605b43a7e34598caef
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 <guzheng1@huawei.com>
---
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 > 0)
+ return error;
}
inode->i_ctime = current_time(inode);
--
2.5.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] tmpfs: clear S_ISGID when setting posix ACLs
2017-01-06 8:12 Gu Zheng
@ 2017-01-06 10:10 ` Jan Kara
2017-01-09 1:26 ` Gu Zheng
0 siblings, 1 reply; 6+ messages in thread
From: Jan Kara @ 2017-01-06 10:10 UTC (permalink / raw)
To: Gu Zheng; +Cc: linux-fsdevel, linux-kernel, viro, jack
On Fri 06-01-17 16:12:55, Gu Zheng wrote:
> This change was missed the tmpfs modification in In CVE-2016-7097
> commit 073931017b49d9458aa351605b43a7e34598caef
> 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 <guzheng1@huawei.com>
Ah, good catch. One comment below:
> 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 > 0)
> + return error;
Uh, why this error > 0 check? AFAIU it should be:
if (error < 0)
return 0;
As it used to be before...
Honza
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] tmpfs: clear S_ISGID when setting posix ACLs
2017-01-06 10:10 ` Jan Kara
@ 2017-01-09 1:26 ` Gu Zheng
0 siblings, 0 replies; 6+ messages in thread
From: Gu Zheng @ 2017-01-09 1:26 UTC (permalink / raw)
To: Jan Kara; +Cc: linux-fsdevel, linux-kernel, viro
thanks, I will update it.
在 2017/1/6 18:10, Jan Kara 写道:
> On Fri 06-01-17 16:12:55, Gu Zheng wrote:
>> This change was missed the tmpfs modification in In CVE-2016-7097
>> commit 073931017b49d9458aa351605b43a7e34598caef
>> 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 <guzheng1@huawei.com>
>
> Ah, good catch. One comment below:
>
>> 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 > 0)
>> + return error;
>
> Uh, why this error > 0 check? AFAIU it should be:
>
> if (error < 0)
> return 0;
>
> As it used to be before...
>
> Honza
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-01-10 8:12 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-09 1:34 [PATCH] tmpfs: clear S_ISGID when setting posix ACLs Gu Zheng
2017-01-10 8:03 ` Jan Kara
2017-01-10 8:12 ` Al Viro
-- strict thread matches above, loose matches on Subject: below --
2017-01-06 8:12 Gu Zheng
2017-01-06 10:10 ` Jan Kara
2017-01-09 1:26 ` Gu Zheng
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).