From: Lucas Stach <l.stach@pengutronix.de>
To: Trond Myklebust <trond.myklebust@primarydata.com>,
Anna Schumaker <anna.schumaker@netapp.com>
Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel@pengutronix.de, patchwork-lst@pengutronix.de
Subject: [PATCH] NFS: fix access bit translation in _nfs4_proc_access()
Date: Fri, 10 Nov 2017 16:03:56 +0100 [thread overview]
Message-ID: <20171110150356.31050-1-l.stach@pengutronix.de> (raw)
Since bd8b2441742b (NFS: Store the raw NFS access mask in the inode's
access cache) the mask already contains the NFS access bits, so it is
wrong to try to map them from the MAY_* bits to the NFS_MAY_* bits
in _nfs4_proc_access(). This leads to bogus access permissions being
returned from the server.
Fix this by using the mask directly, but be careful to not ask for
to broad permissions from the calling nfs_do_access().
CC: stable@vger.kernel.org #4.13+
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Tested-by: Björn Lässig <b.laessig@pengutronix.de>
---
fs/nfs/dir.c | 8 ++++++--
fs/nfs/nfs4proc.c | 19 +------------------
2 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 5ceaeb1f6fb6..dd3a06353bdc 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -2426,8 +2426,12 @@ static int nfs_do_access(struct inode *inode, struct rpc_cred *cred, int mask)
goto out;
/* Be clever: ask server to check for all possible rights */
- cache.mask = NFS_MAY_LOOKUP | NFS_MAY_EXECUTE
- | NFS_MAY_WRITE | NFS_MAY_READ;
+ cache.mask = NFS_MAY_READ;
+ if (S_ISDIR(inode->i_mode))
+ cache.mask |= NFS_DIR_MAY_WRITE | NFS_MAY_LOOKUP;
+ else
+ cache.mask |= NFS_FILE_MAY_WRITE | NFS_MAY_EXECUTE;
+
cache.cred = cred;
status = NFS_PROTO(inode)->access(inode, &cache);
if (status != 0) {
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 6c61e2b99635..cb7b5aafaef6 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -3889,6 +3889,7 @@ static int _nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry
struct nfs4_accessargs args = {
.fh = NFS_FH(inode),
.bitmask = server->cache_consistency_bitmask,
+ .access = entry->mask,
};
struct nfs4_accessres res = {
.server = server,
@@ -3899,26 +3900,8 @@ static int _nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry
.rpc_resp = &res,
.rpc_cred = entry->cred,
};
- int mode = entry->mask;
int status = 0;
- /*
- * Determine which access bits we want to ask for...
- */
- if (mode & MAY_READ)
- args.access |= NFS4_ACCESS_READ;
- if (S_ISDIR(inode->i_mode)) {
- if (mode & MAY_WRITE)
- args.access |= NFS4_ACCESS_MODIFY | NFS4_ACCESS_EXTEND | NFS4_ACCESS_DELETE;
- if (mode & MAY_EXEC)
- args.access |= NFS4_ACCESS_LOOKUP;
- } else {
- if (mode & MAY_WRITE)
- args.access |= NFS4_ACCESS_MODIFY | NFS4_ACCESS_EXTEND;
- if (mode & MAY_EXEC)
- args.access |= NFS4_ACCESS_EXECUTE;
- }
-
res.fattr = nfs_alloc_fattr();
if (res.fattr == NULL)
return -ENOMEM;
--
2.11.0
next reply other threads:[~2017-11-10 15:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-10 15:03 Lucas Stach [this message]
2017-12-12 8:53 ` Lucas Stach
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=20171110150356.31050-1-l.stach@pengutronix.de \
--to=l.stach@pengutronix.de \
--cc=anna.schumaker@netapp.com \
--cc=kernel@pengutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=patchwork-lst@pengutronix.de \
--cc=trond.myklebust@primarydata.com \
/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
all inboxes | Powered by JetHome®