Commit 0965d89e authored by Jan Kara's avatar Jan Kara Committed by Greg Kroah-Hartman

ext4: Don't clear SGID when inheriting ACLs

commit a3bb2d55 upstream.

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: 07393101Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8189a56b
...@@ -189,18 +189,10 @@ __ext4_set_acl(handle_t *handle, struct inode *inode, int type, ...@@ -189,18 +189,10 @@ __ext4_set_acl(handle_t *handle, struct inode *inode, int type,
void *value = NULL; void *value = NULL;
size_t size = 0; size_t size = 0;
int error; int error;
int update_mode = 0;
umode_t mode = inode->i_mode;
switch (type) { switch (type) {
case ACL_TYPE_ACCESS: case ACL_TYPE_ACCESS:
name_index = EXT4_XATTR_INDEX_POSIX_ACL_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; break;
case ACL_TYPE_DEFAULT: case ACL_TYPE_DEFAULT:
...@@ -224,11 +216,6 @@ __ext4_set_acl(handle_t *handle, struct inode *inode, int type, ...@@ -224,11 +216,6 @@ __ext4_set_acl(handle_t *handle, struct inode *inode, int type,
kfree(value); kfree(value);
if (!error) { if (!error) {
set_cached_acl(inode, type, acl); 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; return error;
...@@ -239,6 +226,8 @@ ext4_set_acl(struct inode *inode, struct posix_acl *acl, int type) ...@@ -239,6 +226,8 @@ ext4_set_acl(struct inode *inode, struct posix_acl *acl, int type)
{ {
handle_t *handle; handle_t *handle;
int error, retries = 0; int error, retries = 0;
umode_t mode = inode->i_mode;
int update_mode = 0;
error = dquot_initialize(inode); error = dquot_initialize(inode);
if (error) if (error)
...@@ -249,7 +238,20 @@ ext4_set_acl(struct inode *inode, struct posix_acl *acl, int type) ...@@ -249,7 +238,20 @@ ext4_set_acl(struct inode *inode, struct posix_acl *acl, int type)
if (IS_ERR(handle)) if (IS_ERR(handle))
return PTR_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); 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); ext4_journal_stop(handle);
if (error == -ENOSPC && ext4_should_retry_alloc(inode->i_sb, &retries)) if (error == -ENOSPC && ext4_should_retry_alloc(inode->i_sb, &retries))
goto retry; goto retry;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment