Skip to content

Commit 484fd6c

Browse files
MaxKellermanntytso
authored andcommitted
ext4: apply umask if ACL support is disabled
The function ext4_init_acl() calls posix_acl_create() which is responsible for applying the umask. But without CONFIG_EXT4_FS_POSIX_ACL, ext4_init_acl() is an empty inline function, and nobody applies the umask. This fixes a bug which causes the umask to be ignored with O_TMPFILE on ext4: MusicPlayerDaemon/MPD#558 https://bugs.gentoo.org/show_bug.cgi?id=686142#c3 https://bugzilla.kernel.org/show_bug.cgi?id=203625 Reviewed-by: "J. Bruce Fields" <[email protected]> Cc: [email protected] Signed-off-by: Max Kellermann <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Theodore Ts'o <[email protected]>
1 parent 2cd8bdb commit 484fd6c

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

fs/ext4/acl.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,11 @@ extern int ext4_init_acl(handle_t *, struct inode *, struct inode *);
6868
static inline int
6969
ext4_init_acl(handle_t *handle, struct inode *inode, struct inode *dir)
7070
{
71+
/* usually, the umask is applied by posix_acl_create(), but if
72+
ext4 ACL support is disabled at compile time, we need to do
73+
it here, because posix_acl_create() will never be called */
74+
inode->i_mode &= ~current_umask();
75+
7176
return 0;
7277
}
7378
#endif /* CONFIG_EXT4_FS_POSIX_ACL */

0 commit comments

Comments
 (0)