From: Max Kellermann <mk@cm4all.com>
To: linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org,
trond.myklebust@hammerspace.com, bfields@redhat.com,
tytso@mit.edu, adilger.kernel@dilger.ca, hughd@google.com,
anna.schumaker@netapp.com
Cc: linux-kernel@vger.kernel.org, Max Kellermann <mk@cm4all.com>,
stable@vger.kernel.org
Subject: [PATCH v2 2/4] fs/ext4/acl: apply umask if ACL support is disabled
Date: Sat, 13 Jul 2019 06:11:58 +0200 [thread overview]
Message-ID: <20190713041200.18566-2-mk@cm4all.com> (raw)
In-Reply-To: <20190713041200.18566-1-mk@cm4all.com>
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:
https://github.com/MusicPlayerDaemon/MPD/issues/558
https://bugs.gentoo.org/show_bug.cgi?id=686142#c3
https://bugzilla.kernel.org/show_bug.cgi?id=203625
Signed-off-by: Max Kellermann <mk@cm4all.com>
Cc: stable@vger.kernel.org
---
fs/ext4/acl.h | 5 +++++
1 file changed, 5 insertions(+)
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 */
--
2.20.1
next prev parent reply other threads:[~2019-07-13 4:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-13 4:11 [PATCH v2 1/4] fs/posix_acl: apply umask if superblock disables ACL support Max Kellermann
2019-07-13 4:11 ` Max Kellermann [this message]
2019-07-13 4:11 ` [PATCH v2 3/4] linux/fs.h: fix umask on NFS with CONFIG_FS_POSIX_ACL=n Max Kellermann
2019-08-27 15:03 ` Jan Kara
2019-07-13 4:12 ` [PATCH v2 4/4] nfs/super: check NFS_CAP_ACLS instead of the NFS version Max Kellermann
2019-08-20 21:26 ` [PATCH v2 1/4] fs/posix_acl: apply umask if superblock disables ACL support J. Bruce Fields
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190713041200.18566-2-mk@cm4all.com \
--to=mk@cm4all.com \
--cc=adilger.kernel@dilger.ca \
--cc=anna.schumaker@netapp.com \
--cc=bfields@redhat.com \
--cc=hughd@google.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=trond.myklebust@hammerspace.com \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).