From: Scott Mayhew <smayhew@redhat.com>
To: anna.schumaker@netapp.com, trond.myklebust@hammerspace.com
Cc: dhowells@redhat.com, viro@zeniv.linux.org.uk,
linux-nfs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-security-module@vger.kernel.org
Subject: [PATCH v6 14/27] nfs_clone_sb_security(): simplify the check for server bogosity
Date: Tue, 10 Dec 2019 07:31:02 -0500 [thread overview]
Message-ID: <20191210123115.1655-15-smayhew@redhat.com> (raw)
In-Reply-To: <20191210123115.1655-1-smayhew@redhat.com>
From: Al Viro <viro@zeniv.linux.org.uk>
We used to check ->i_op for being nfs_dir_inode_operations. With
separate inode_operations for v3 and v4 that became bogus, but
rather than going for protocol-dependent comparison we could've
just checked ->i_fop instead; _that_ is the same for all protocol
versions.
Reviewed-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
fs/nfs/super.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 2bcf0f8295e0..bec6c341f72c 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -2578,7 +2578,7 @@ int nfs_clone_sb_security(struct super_block *s, struct dentry *mntroot,
unsigned long kflags = 0, kflags_out = 0;
/* clone any lsm security options from the parent to the new sb */
- if (d_inode(mntroot)->i_op != NFS_SB(s)->nfs_client->rpc_ops->dir_inode_ops)
+ if (d_inode(mntroot)->i_fop != &nfs_dir_operations)
return -ESTALE;
if (NFS_SB(s)->caps & NFS_CAP_SECURITY_LABEL)
--
2.17.2
next prev parent reply other threads:[~2019-12-10 12:33 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-10 12:30 [PATCH v6 00/27] nfs: Mount API conversion Scott Mayhew
2019-12-10 12:30 ` [PATCH v6 01/27] saner calling conventions for nfs_fs_mount_common() Scott Mayhew
2019-12-10 12:30 ` [PATCH v6 02/27] nfs: stash server into struct nfs_mount_info Scott Mayhew
2019-12-10 12:30 ` [PATCH v6 03/27] nfs: lift setting mount_info from nfs4_remote{,_referral}_mount Scott Mayhew
2019-12-10 12:30 ` [PATCH v6 04/27] nfs: fold nfs4_remote_fs_type and nfs4_remote_referral_fs_type Scott Mayhew
2019-12-10 12:30 ` [PATCH v6 05/27] nfs: don't bother setting/restoring export_path around do_nfs_root_mount() Scott Mayhew
2019-12-10 12:30 ` [PATCH v6 06/27] nfs4: fold nfs_do_root_mount/nfs_follow_remote_path Scott Mayhew
2019-12-10 12:30 ` [PATCH v6 07/27] nfs: lift setting mount_info from nfs_xdev_mount() Scott Mayhew
2019-12-10 12:30 ` [PATCH v6 08/27] nfs: stash nfs_subversion reference into nfs_mount_info Scott Mayhew
2019-12-10 12:30 ` [PATCH v6 09/27] nfs: don't bother passing nfs_subversion to ->try_mount() and nfs_fs_mount_common() Scott Mayhew
2019-12-10 12:30 ` [PATCH v6 10/27] nfs: merge xdev and remote file_system_type Scott Mayhew
2019-12-10 12:30 ` [PATCH v6 11/27] nfs: unexport nfs_fs_mount_common() Scott Mayhew
2019-12-10 12:31 ` [PATCH v6 12/27] nfs: don't pass nfs_subversion to ->create_server() Scott Mayhew
2019-12-10 12:31 ` [PATCH v6 13/27] nfs: get rid of mount_info ->fill_super() Scott Mayhew
2019-12-10 12:31 ` Scott Mayhew [this message]
2019-12-10 12:31 ` [PATCH v6 15/27] nfs: get rid of ->set_security() Scott Mayhew
2019-12-10 12:31 ` [PATCH v6 16/27] NFS: Move mount parameterisation bits into their own file Scott Mayhew
2019-12-10 12:31 ` [PATCH v6 17/27] NFS: Constify mount argument match tables Scott Mayhew
2019-12-10 12:31 ` [PATCH v6 18/27] NFS: Rename struct nfs_parsed_mount_data to struct nfs_fs_context Scott Mayhew
2019-12-10 12:31 ` [PATCH v6 19/27] NFS: Split nfs_parse_mount_options() Scott Mayhew
2019-12-10 12:31 ` [PATCH v6 20/27] NFS: Deindent nfs_fs_context_parse_option() Scott Mayhew
2019-12-10 12:31 ` [PATCH v6 21/27] NFS: Add a small buffer in nfs_fs_context to avoid string dup Scott Mayhew
2019-12-10 12:31 ` [PATCH v6 22/27] NFS: Do some tidying of the parsing code Scott Mayhew
2019-12-10 12:31 ` [PATCH v6 23/27] NFS: rename nfs_fs_context pointer arg in a few functions Scott Mayhew
2019-12-10 12:31 ` [PATCH v6 24/27] NFS: Convert mount option parsing to use functionality from fs_parser.h Scott Mayhew
2019-12-10 12:31 ` [PATCH v6 25/27] NFS: Add fs_context support Scott Mayhew
2019-12-10 12:31 ` [PATCH v6 26/27] NFS: Additional refactoring for fs_context conversion Scott Mayhew
2019-12-10 12:31 ` [PATCH v6 27/27] NFS: Attach supplementary error information to fs_context Scott Mayhew
2019-12-10 21:16 ` [PATCH v6 00/27] nfs: Mount API conversion Schumaker, Anna
2019-12-11 13:21 ` Scott Mayhew
2019-12-13 21:39 ` Scott Mayhew
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=20191210123115.1655-15-smayhew@redhat.com \
--to=smayhew@redhat.com \
--cc=anna.schumaker@netapp.com \
--cc=dhowells@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=trond.myklebust@hammerspace.com \
--cc=viro@zeniv.linux.org.uk \
/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).