diff options
author | Jan Kara <jack@suse.cz> | 2016-09-19 17:39:09 +0200 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2016-09-22 10:55:32 +0200 |
commit | 073931017b49d9458aa351605b43a7e34598caef (patch) | |
tree | 8c4374e82e5cad92bdb589e5be417f1a94870399 /fs/ocfs2/acl.c | |
parent | 5d3ddd84eaefffd23c028bce5610dac8726f71c1 (diff) | |
download | linux-stable-073931017b49d9458aa351605b43a7e34598caef.tar.gz linux-stable-073931017b49d9458aa351605b43a7e34598caef.tar.bz2 linux-stable-073931017b49d9458aa351605b43a7e34598caef.zip |
posix_acl: Clear SGID bit when setting file permissions
When file permissions are modified via chmod(2) and the user is not in
the owning group or capable of CAP_FSETID, the setgid bit is cleared in
inode_change_ok(). Setting a POSIX ACL via setxattr(2) sets the file
permissions as well as the new ACL, but doesn't clear the setgid bit in
a similar way; this allows to bypass the check in chmod(2). Fix that.
References: CVE-2016-7097
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Diffstat (limited to 'fs/ocfs2/acl.c')
-rw-r--r-- | fs/ocfs2/acl.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/ocfs2/acl.c b/fs/ocfs2/acl.c index 2162434728c0..164307b99405 100644 --- a/fs/ocfs2/acl.c +++ b/fs/ocfs2/acl.c @@ -241,13 +241,11 @@ int ocfs2_set_acl(handle_t *handle, case ACL_TYPE_ACCESS: name_index = OCFS2_XATTR_INDEX_POSIX_ACL_ACCESS; if (acl) { - umode_t mode = inode->i_mode; - ret = posix_acl_equiv_mode(acl, &mode); - if (ret < 0) - return ret; + umode_t mode; - if (ret == 0) - acl = NULL; + ret = posix_acl_update_mode(inode, &mode, &acl); + if (ret) + return ret; ret = ocfs2_acl_set_mode(inode, di_bh, handle, mode); |