ext4: Don't clear SGID when inheriting ACLs
authorJan Kara <jack@suse.cz>
Mon, 31 Jul 2017 03:33:01 +0000 (23:33 -0400)
committerBen Hutchings <ben@decadent.org.uk>
Thu, 12 Oct 2017 14:27:18 +0000 (15:27 +0100)
commit36d0828c0295524c261c6d1df93203a3379c9bb1
treeadfa7506a42352e2e5f6d35b2c63c8aa993b5d08
parente4234d2c74ebfbac18198a14943d45b913649f78
ext4: Don't clear SGID when inheriting ACLs

commit a3bb2d5587521eea6dab2d05326abb0afb460abd 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: 073931017b49d9458aa351605b43a7e34598caef
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Jan Kara <jack@suse.cz>
Reviewed-by: Andreas Gruenbacher <agruenba@redhat.com>
[bwh: Backported to 3.2: the __ext4_set_acl() function didn't exist,
 so added it]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
fs/ext4/acl.c