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 4/4] nfs/super: check NFS_CAP_ACLS instead of the NFS version
Date: Sat, 13 Jul 2019 06:12:00 +0200 [thread overview]
Message-ID: <20190713041200.18566-4-mk@cm4all.com> (raw)
In-Reply-To: <20190713041200.18566-1-mk@cm4all.com>
This sets MS_POSIXACL only if ACL support is really enabled, instead
of always setting MS_POSIXACL if the NFS protocol version
theoretically supports ACL.
The code comment says "We will [apply the umask] ourselves", but that
happens in posix_acl_create() only if the kernel has POSIX ACL
support. Without it, posix_acl_create() is an empty dummy function.
So let's not pretend we will apply the umask if we can already know
that we will never.
This fixes a problem where the umask is always ignored in the NFS
client when compiled without CONFIG_FS_POSIX_ACL. This is a 4 year
old regression caused by commit 013cdf1088d723 which itself was not
completely wrong, but failed to consider all the side effects by
misdesigned VFS code.
Signed-off-by: Max Kellermann <mk@cm4all.com>
Cc: stable@vger.kernel.org
---
fs/nfs/super.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index f88ddac2dcdf..886ad89af676 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -2353,11 +2353,14 @@ void nfs_fill_super(struct super_block *sb, struct nfs_mount_info *mount_info)
if (data && data->bsize)
sb->s_blocksize = nfs_block_size(data->bsize, &sb->s_blocksize_bits);
- if (server->nfs_client->rpc_ops->version != 2) {
+ if (NFS_SB(sb)->caps & NFS_CAP_ACLS) {
/* The VFS shouldn't apply the umask to mode bits. We will do
* so ourselves when necessary.
*/
sb->s_flags |= SB_POSIXACL;
+ }
+
+ if (server->nfs_client->rpc_ops->version != 2) {
sb->s_time_gran = 1;
sb->s_export_op = &nfs_export_ops;
}
@@ -2383,7 +2386,7 @@ static void nfs_clone_super(struct super_block *sb,
sb->s_time_gran = 1;
sb->s_export_op = old_sb->s_export_op;
- if (server->nfs_client->rpc_ops->version != 2) {
+ if (NFS_SB(sb)->caps & NFS_CAP_ACLS) {
/* The VFS shouldn't apply the umask to mode bits. We will do
* so ourselves when necessary.
*/
--
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 ` [PATCH v2 2/4] fs/ext4/acl: apply umask if ACL support is disabled Max Kellermann
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 ` Max Kellermann [this message]
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-4-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).