FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-21 00:42:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hfsplus: Don't clear SGID when inheriting ACLs

Browse Source 
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 creating __hfsplus_set_posix_acl() function that does
not call posix_acl_update_mode() and use it when inheriting ACLs. That
prevents SGID bit clearing and the mode has been properly set by
posix_acl_create() anyway.

Fixes: 073931017b
CC: stable@vger.kernel.org
Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
Jan Kara 2017-06-21 15:02:47 +02:00
parent 34363c057b
commit 84969465dd
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fs/hfsplus/posix_acl.c
View File

@ -51,8 +51,8 @@ struct posix_acl *hfsplus_get_posix_acl(struct inode *inode, int type)
return acl; return acl;
} }
int hfsplus_set_posix_acl(struct inode *inode, struct posix_acl *acl, static int __hfsplus_set_posix_acl(struct inode *inode, struct posix_acl *acl,
int type) int type)
{ {
int err; int err;
char *xattr_name; char *xattr_name;
@ -64,12 +64,6 @@ int hfsplus_set_posix_acl(struct inode *inode, struct posix_acl *acl,
switch (type) { switch (type) {
case ACL_TYPE_ACCESS: case ACL_TYPE_ACCESS:
xattr_name = XATTR_NAME_POSIX_ACL_ACCESS; xattr_name = XATTR_NAME_POSIX_ACL_ACCESS;
if (acl) {
err = posix_acl_update_mode(inode, &inode->i_mode, &acl);
if (err)
return err;
}
err = 0;
break; break;
case ACL_TYPE_DEFAULT: case ACL_TYPE_DEFAULT:
@ -105,6 +99,18 @@ end_set_acl:
return err; return err;
} }
int hfsplus_set_posix_acl(struct inode *inode, struct posix_acl *acl, int type)
{
int err;
if (type == ACL_TYPE_ACCESS && acl) {
err = posix_acl_update_mode(inode, &inode->i_mode, &acl);
if (err)
return err;
}
return __hfsplus_set_posix_acl(inode, acl, type);
}
int hfsplus_init_posix_acl(struct inode *inode, struct inode *dir) int hfsplus_init_posix_acl(struct inode *inode, struct inode *dir)
{ {
int err = 0; int err = 0;
@ -122,15 +128,15 @@ int hfsplus_init_posix_acl(struct inode *inode, struct inode *dir)
return err; return err;
if (default_acl) { if (default_acl) {
err = hfsplus_set_posix_acl(inode, default_acl, err = __hfsplus_set_posix_acl(inode, default_acl,
ACL_TYPE_DEFAULT); ACL_TYPE_DEFAULT);
posix_acl_release(default_acl); posix_acl_release(default_acl);
} }
if (acl) { if (acl) {
if (!err) if (!err)
err = hfsplus_set_posix_acl(inode, acl, err = __hfsplus_set_posix_acl(inode, acl,
ACL_TYPE_ACCESS); ACL_TYPE_ACCESS);
posix_acl_release(acl); posix_acl_release(acl);
} }
return err; return err;