Commit fe26569e authored by Ernesto A. Fernández's avatar Ernesto A. Fernández Committed by Jan Kara

ext2: preserve i_mode if ext2_set_acl() fails

When changing a file's acl mask, ext2_set_acl() will first set the group
bits of i_mode to the value of the mask, and only then set the actual
extended attribute representing the new acl.

If the second part fails (due to lack of space, for example) and the file
had no acl attribute to begin with, the system will from now on assume
that the mask permission bits are actual group permission bits, potentially
granting access to the wrong users.

Prevent this by only changing the inode mode after the acl has been set.

[JK: Rebased on top of "ext2: Don't clear SGID when inheriting ACLs"]
Signed-off-by: default avatarErnesto A. Fernández <ernesto.mnd.fernandez@gmail.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent a992f2d3
...@@ -218,15 +218,22 @@ int ...@@ -218,15 +218,22 @@ int
ext2_set_acl(struct inode *inode, struct posix_acl *acl, int type) ext2_set_acl(struct inode *inode, struct posix_acl *acl, int type)
{ {
int error; int error;
int update_mode = 0;
umode_t mode = inode->i_mode;
if (type == ACL_TYPE_ACCESS && acl) { if (type == ACL_TYPE_ACCESS && acl) {
error = posix_acl_update_mode(inode, &inode->i_mode, &acl); error = posix_acl_update_mode(inode, &mode, &acl);
if (error) if (error)
return error; return error;
update_mode = 1;
}
error = __ext2_set_acl(inode, acl, type);
if (!error && update_mode) {
inode->i_mode = mode;
inode->i_ctime = current_time(inode); inode->i_ctime = current_time(inode);
mark_inode_dirty(inode); mark_inode_dirty(inode);
} }
return __ext2_set_acl(inode, acl, type); return error;
} }
/* /*
......
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