[2/4] fs/ext4/acl: apply umask if ACL support is disabled
diff mbox series

Message ID 20190703124715.4319-2-max.kellermann@gmail.com
State New
Headers show
  • [1/4] fs/posix_acl: apply umask if superblock disables ACL support
Related show

Commit Message

Max Kellermann July 3, 2019, 12:47 p.m. UTC
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:


Signed-off-by: Max Kellermann <max.kellermann@gmail.com>
 fs/ext4/acl.h | 5 +++++
 1 file changed, 5 insertions(+)

diff mbox series

diff --git a/fs/ext4/acl.h b/fs/ext4/acl.h
index 9b63f5416a2f..7f3b25b3fa6d 100644
--- a/fs/ext4/acl.h
+++ b/fs/ext4/acl.h
@@ -67,6 +67,11 @@  extern int ext4_init_acl(handle_t *, struct inode *, struct inode *);
 static inline int
 ext4_init_acl(handle_t *handle, struct inode *inode, struct inode *dir)
+	/* usually, the umask is applied by posix_acl_create(), but if
+	   ext4 ACL support is disabled at compile time, we need to do
+	   it here, because posix_acl_create() will never be called */
+	inode->i_mode &= ~current_umask();
 	return 0;
 #endif  /* CONFIG_EXT4_FS_POSIX_ACL */