Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1552591 > unrolled thread
| Started by | Gu Zheng <guzheng1@huawei.com> |
|---|---|
| First post | 2017-01-06 09:20 +0100 |
| Last post | 2017-01-09 02:30 +0100 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] tmpfs: clear S_ISGID when setting posix ACLs Gu Zheng <guzheng1@huawei.com> - 2017-01-06 09:20 +0100
Re: [PATCH] tmpfs: clear S_ISGID when setting posix ACLs Jan Kara <jack@suse.cz> - 2017-01-06 11:20 +0100
Re: [PATCH] tmpfs: clear S_ISGID when setting posix ACLs Gu Zheng <guzheng1@huawei.com> - 2017-01-09 02:30 +0100
| From | Gu Zheng <guzheng1@huawei.com> |
|---|---|
| Date | 2017-01-06 09:20 +0100 |
| Subject | [PATCH] tmpfs: clear S_ISGID when setting posix ACLs |
| Message-ID | <sWxUJ-7lA-5@gated-at.bofh.it> |
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
[toc] | [next] | [standalone]
| From | Jan Kara <jack@suse.cz> |
|---|---|
| Date | 2017-01-06 11:20 +0100 |
| Message-ID | <sWzMS-iN-19@gated-at.bofh.it> |
| In reply to | #1552591 |
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
[toc] | [prev] | [next] | [standalone]
| From | Gu Zheng <guzheng1@huawei.com> |
|---|---|
| Date | 2017-01-09 02:30 +0100 |
| Message-ID | <sXwWB-5Qf-1@gated-at.bofh.it> |
| In reply to | #1552664 |
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
>
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web