2024-03-15 14:31:35

by Max Kellermann

Subject: [PATCH] Revert "ext4: apply umask if ACL support is disabled"

This reverts commit 484fd6c1de13b336806a967908a927cc0356e312. The
commit caused a regression because now the umask was applied to
symlinks and the fix is unnecessary because the umask/O_TMPFILE bug
has been fixed somewhere else already.

Fixes: https://lore.kernel.org/lkml/[email protected]/
Signed-off-by: Max Kellermann <[email protected]>
---
fs/ext4/acl.h | 5 -----
1 file changed, 5 deletions(-)

diff --git a/fs/ext4/acl.h b/fs/ext4/acl.h
index ef4c19e5f570..0c5a79c3b5d4 100644
--- a/fs/ext4/acl.h
+++ b/fs/ext4/acl.h
@@ -68,11 +68,6 @@ 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 */
--
2.39.2

2024-03-25 11:08:01

by Michael Forney

Subject: Re: [PATCH] Revert "ext4: apply umask if ACL support is disabled"

Max Kellermann <[email protected]> wrote:
> This reverts commit 484fd6c1de13b336806a967908a927cc0356e312. The
> commit caused a regression because now the umask was applied to
> symlinks and the fix is unnecessary because the umask/O_TMPFILE bug
> has been fixed somewhere else already.

Thanks, Max! I've verified that this fixes symlink modes for me,
as well as the flatpak corruption error I was getting.

> Fixes: https://lore.kernel.org/lkml/[email protected]/
> Signed-off-by: Max Kellermann <[email protected]>

Tested-by: Michael Forney <[email protected]>