[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1586868.1715341641@warthog.procyon.org.uk>
Date: Fri, 10 May 2024 12:47:21 +0100
From: David Howells <dhowells@...hat.com>
To: Max Kellermann <max.kellermann@...os.com>, Jan Kara <jack@...e.com>
cc: dhowells@...hat.com, Miklos Szeredi <miklos@...redi.hu>,
Christian Brauner <brauner@...nel.org>, linux-ext4@...r.kernel.org,
linux-fsdevel@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [PATCH v3] ext4: Don't reduce symlink i_mode by umask if no ACL support
If CONFIG_EXT4_FS_POSIX_ACL=n then the fallback version of ext4_init_acl()
will mask off the umask bits from the new inode's i_mode. This should not
be done if the inode is a symlink. If CONFIG_EXT4_FS_POSIX_ACL=y, then we
go through posix_acl_create() instead which does the right thing with
symlinks.
However, this is actually unnecessary now as vfs_prepare_mode() has already
done this where appropriate, so fix this by making the fallback version of
ext4_init_acl() do nothing.
Fixes: 484fd6c1de13 ("ext4: apply umask if ACL support is disabled")
Suggested-by: Miklos Szeredi <miklos@...redi.hu>
Signed-off-by: David Howells <dhowells@...hat.com>
cc: Max Kellermann <max.kellermann@...os.com>
cc: Jan Kara <jack@...e.com>
cc: Christian Brauner <brauner@...nel.org>
cc: linux-ext4@...r.kernel.org
cc: linux-fsdevel@...r.kernel.org
---
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 */
Powered by blists - more mailing lists