From: Frank van der Linden <fllinden@amazon.com>
To: <bfields@fieldses.org>, <chuck.lever@oracle.com>,
<linux-nfs@vger.kernel.org>
Cc: Frank van der Linden <fllinden@amazon.com>
Subject: [PATCH v2 07/11] nfsd: take xattr bits in to account for permission checks
Date: Fri, 27 Mar 2020 23:27:13 +0000 [thread overview]
Message-ID: <20200327232717.15331-8-fllinden@amazon.com> (raw)
In-Reply-To: <20200327232717.15331-1-fllinden@amazon.com>
Since the NFSv4.2 extended attributes extension defines 3 new access
bits for xattr operations, take them in to account when validating
what the client is asking for, and when checking permissions.
Signed-off-by: Frank van der Linden <fllinden@amazon.com>
---
fs/nfsd/nfs4proc.c | 8 +++++++-
fs/nfsd/vfs.c | 12 ++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 0e75f7fb5fec..ee317ae0b609 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -566,8 +566,14 @@ nfsd4_access(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
union nfsd4_op_u *u)
{
struct nfsd4_access *access = &u->access;
+ u32 access_full;
- if (access->ac_req_access & ~NFS3_ACCESS_FULL)
+ access_full = NFS3_ACCESS_FULL;
+ if (cstate->minorversion >= 2)
+ access_full |= NFS4_ACCESS_XALIST | NFS4_ACCESS_XAREAD |
+ NFS4_ACCESS_XAWRITE;
+
+ if (access->ac_req_access & ~access_full)
return nfserr_inval;
access->ac_resp_access = access->ac_req_access;
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 115449009bc0..19608e690069 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -612,6 +612,12 @@ static struct accessmap nfs3_regaccess[] = {
{ NFS3_ACCESS_MODIFY, NFSD_MAY_WRITE|NFSD_MAY_TRUNC },
{ NFS3_ACCESS_EXTEND, NFSD_MAY_WRITE },
+#ifdef CONFIG_NFSD_V4
+ { NFS4_ACCESS_XAREAD, NFSD_MAY_READ },
+ { NFS4_ACCESS_XAWRITE, NFSD_MAY_WRITE },
+ { NFS4_ACCESS_XALIST, NFSD_MAY_READ },
+#endif
+
{ 0, 0 }
};
@@ -622,6 +628,12 @@ static struct accessmap nfs3_diraccess[] = {
{ NFS3_ACCESS_EXTEND, NFSD_MAY_EXEC|NFSD_MAY_WRITE },
{ NFS3_ACCESS_DELETE, NFSD_MAY_REMOVE },
+#ifdef CONFIG_NFSD_V4
+ { NFS4_ACCESS_XAREAD, NFSD_MAY_READ },
+ { NFS4_ACCESS_XAWRITE, NFSD_MAY_WRITE },
+ { NFS4_ACCESS_XALIST, NFSD_MAY_READ },
+#endif
+
{ 0, 0 }
};
--
2.17.2
next prev parent reply other threads:[~2020-03-27 23:27 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-27 23:27 [PATCH v2 00/11] NFS server user xattr support (RFC8276) Frank van der Linden
2020-03-27 23:27 ` [PATCH v2 01/11] xattr: break delegations in {set,remove}xattr and add _locked versions Frank van der Linden
2020-03-31 13:11 ` Sasha Levin
2020-03-27 23:27 ` [PATCH v2 02/11] xattr: add a function to check if a namespace is supported Frank van der Linden
2020-03-27 23:27 ` [PATCH v2 03/11] nfs,nfsd: NFSv4.2 extended attribute protocol definitions Frank van der Linden
2020-03-27 23:27 ` [PATCH v2 04/11] nfsd: split off the write decode code in to a separate function Frank van der Linden
2020-03-27 23:27 ` [PATCH v2 05/11] nfsd: add defines for NFSv4.2 extended attribute support Frank van der Linden
2020-03-27 23:27 ` [PATCH v2 06/11] nfsd: define xattr functions to call in to their vfs counterparts Frank van der Linden
2020-03-27 23:27 ` Frank van der Linden [this message]
2020-03-27 23:27 ` [PATCH v2 08/11] nfsd: add structure definitions for xattr requests / responses Frank van der Linden
2020-03-27 23:27 ` [PATCH v2 09/11] nfsd: use kvmalloc in svcxdr_tmpalloc Frank van der Linden
2020-03-27 23:27 ` [PATCH v2 10/11] nfsd: implement the xattr functions and en/decode logic Frank van der Linden
2020-03-29 20:25 ` vfs_listxattr and the NFS server: namespaces Frank van der Linden
2020-03-29 21:54 ` Chuck Lever
2020-03-29 22:57 ` Frank van der Linden
2020-03-27 23:27 ` [PATCH v2 11/11] nfsd: add fattr support for user extended attributes Frank van der Linden
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=20200327232717.15331-8-fllinden@amazon.com \
--to=fllinden@amazon.com \
--cc=bfields@fieldses.org \
--cc=chuck.lever@oracle.com \
--cc=linux-nfs@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.