From: Chuck Lever <chuck.lever@oracle.com>
To: linux-nfs@vger.kernel.org
Subject: [PATCH v1 39/61] NFSD: Add a helper to decode state_protect4_a
Date: Fri, 13 Nov 2020 10:05:48 -0500 [thread overview]
Message-ID: <160527994831.6186.7016565184206978517.stgit@klimt.1015granger.net> (raw)
In-Reply-To: <160527962905.6186.17550620763636619885.stgit@klimt.1015granger.net>
Refactor for clarity.
Also, remove a stale comment. Commit ed94164398c9 ("nfsd: implement
machine credential support for some operations") added support for
SP4_MACH_CRED, so state_protect_a is no longer completely ignored.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
fs/nfsd/nfs4state.c | 2 +-
fs/nfsd/nfs4xdr.c | 51 +++++++++++++++++++++++++++++++++------------------
fs/nfsd/xdr4.h | 2 +-
3 files changed, 35 insertions(+), 20 deletions(-)
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index d7f27ed6b794..be6dcc4c2ab0 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -3066,7 +3066,7 @@ nfsd4_exchange_id(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
rpc_ntop(sa, addr_str, sizeof(addr_str));
dprintk("%s rqstp=%p exid=%p clname.len=%u clname.data=%p "
- "ip_addr=%s flags %x, spa_how %d\n",
+ "ip_addr=%s flags %x, spa_how %u\n",
__func__, rqstp, exid, exid->clname.len, exid->clname.data,
addr_str, exid->flags, exid->spa_how);
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 4d666e2f8583..d3e238b538d0 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -1528,26 +1528,13 @@ static __be32 nfsd4_decode_ssv_sp_parms(struct nfsd4_compoundargs *argp)
return nfserr_bad_xdr;
}
-static __be32
-nfsd4_decode_exchange_id(struct nfsd4_compoundargs *argp,
- struct nfsd4_exchange_id *exid)
+static __be32 nfsd4_decode_state_protect4_a(struct nfsd4_compoundargs *argp,
+ struct nfsd4_exchange_id *exid)
{
- DECODE_HEAD;
- int dummy;
-
- READ_BUF(NFS4_VERIFIER_SIZE);
- COPYMEM(exid->verifier.data, NFS4_VERIFIER_SIZE);
-
- status = nfsd4_decode_opaque(argp, &exid->clname);
- if (status)
- return nfserr_bad_xdr;
-
- READ_BUF(4);
- exid->flags = be32_to_cpup(p++);
+ __be32 status;
- /* Ignore state_protect4_a */
- READ_BUF(4);
- exid->spa_how = be32_to_cpup(p++);
+ if (xdr_stream_decode_u32(argp->xdr, &exid->spa_how) < 0)
+ goto xdr_error;
switch (exid->spa_how) {
case SP4_NONE:
break;
@@ -1569,6 +1556,34 @@ nfsd4_decode_exchange_id(struct nfsd4_compoundargs *argp,
goto xdr_error;
}
+ status = nfs_ok;
+out:
+ return status;
+xdr_error:
+ return nfserr_bad_xdr;
+}
+
+static __be32
+nfsd4_decode_exchange_id(struct nfsd4_compoundargs *argp,
+ struct nfsd4_exchange_id *exid)
+{
+ DECODE_HEAD;
+ int dummy;
+
+ status = nfsd4_decode_verifier4(argp, &exid->verifier);
+ if (status)
+ goto out;
+ status = nfsd4_decode_opaque(argp, &exid->clname);
+ if (status)
+ goto out;
+
+ READ_BUF(4);
+ exid->flags = be32_to_cpup(p++);
+
+ status = nfsd4_decode_state_protect4_a(argp, exid);
+ if (status)
+ goto out;
+
READ_BUF(4); /* nfs_impl_id4 array length */
dummy = be32_to_cpup(p++);
diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h
index 6245004a9993..232529bc1b79 100644
--- a/fs/nfsd/xdr4.h
+++ b/fs/nfsd/xdr4.h
@@ -433,7 +433,7 @@ struct nfsd4_exchange_id {
u32 flags;
clientid_t clientid;
u32 seqid;
- int spa_how;
+ u32 spa_how;
u32 spo_must_enforce[3];
u32 spo_must_allow[3];
struct xdr_netobj nii_domain;
next prev parent reply other threads:[~2020-11-13 15:05 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-13 15:02 [PATCH v1 00/61] Update NFSD XDR functions Chuck Lever
2020-11-13 15:02 ` [PATCH v1 01/61] NFSD: Fix returned READDIR offset cookie Chuck Lever
2020-11-13 15:02 ` [PATCH v1 02/61] SUNRPC: Add xdr_set_scratch_page() and xdr_reset_scratch_buffer() Chuck Lever
2020-11-13 15:02 ` [PATCH v1 03/61] SUNRPC: Prepare for xdr_stream-style decoding on the server-side Chuck Lever
2020-11-13 15:02 ` [PATCH v1 04/61] NFSD: Add common helpers to decode void args and encode void results Chuck Lever
2020-11-13 15:02 ` [PATCH v1 05/61] NFSD: Replace the internals of the READ_BUF() macro Chuck Lever
2020-11-13 15:02 ` [PATCH v1 06/61] NFSD: Replace READ* macros in nfsd4_decode_access() Chuck Lever
2020-11-14 9:28 ` Christoph Hellwig
2020-11-14 18:26 ` Chuck Lever
2020-11-14 18:45 ` Christoph Hellwig
2020-11-14 18:48 ` Chuck Lever
2020-11-14 18:49 ` Christoph Hellwig
2020-11-13 15:03 ` [PATCH v1 07/61] NFSD: Replace READ* macros in nfsd4_decode_close() Chuck Lever
2020-11-14 9:29 ` Christoph Hellwig
2020-11-14 18:30 ` Chuck Lever
2020-11-14 18:47 ` Christoph Hellwig
2020-11-13 15:03 ` [PATCH v1 08/61] NFSD: Replace READ* macros in nfsd4_decode_commit() Chuck Lever
2020-11-13 15:03 ` [PATCH v1 09/61] NFSD: Replace READ* macros in nfsd4_decode_create() Chuck Lever
2020-11-13 15:03 ` [PATCH v1 10/61] NFSD: Replace READ* macros in nfsd4_decode_bitmap() Chuck Lever
2020-11-13 15:03 ` [PATCH v1 11/61] NFSD: Replace READ* macros in nfsd4_decode_link() Chuck Lever
2020-11-13 15:03 ` [PATCH v1 12/61] NFSD: Relocate nfsd4_decode_opaque() Chuck Lever
2020-11-13 15:03 ` [PATCH v1 13/61] NFSD: Replace READ* macros in nfsd4_decode_lock() Chuck Lever
2020-11-13 15:03 ` [PATCH v1 14/61] NFSD: Replace READ* macros in nfsd4_decode_lockt() Chuck Lever
2020-11-13 15:03 ` [PATCH v1 15/61] NFSD: Replace READ* macros in nfsd4_decode_locku() Chuck Lever
2020-11-13 15:03 ` [PATCH v1 16/61] NFSD: Replace READ* macros in nfsd4_decode_lookup() Chuck Lever
2020-11-13 15:03 ` [PATCH v1 17/61] NFSD: Replace READ* macros in nfsd4_decode_time() Chuck Lever
2020-11-13 15:03 ` [PATCH v1 18/61] NFSD: Replace READ* macros in nfsd4_decode_fattr() Chuck Lever
2020-11-13 15:04 ` [PATCH v1 19/61] NFSD: Replace READ* macros in nfsd4_decode_open() Chuck Lever
2020-11-13 15:04 ` [PATCH v1 20/61] NFSD: Replace READ* macros in nfsd4_decode_open_confirm() Chuck Lever
2020-11-13 15:04 ` [PATCH v1 21/61] NFSD: Replace READ* macros in nfsd4_decode_open_downgrade() Chuck Lever
2020-11-13 15:04 ` [PATCH v1 22/61] NFSD: Replace READ* macros in nfsd4_decode_putfh() Chuck Lever
2020-11-13 15:04 ` [PATCH v1 23/61] NFSD: Replace READ* macros in nfsd4_decode_read() Chuck Lever
2020-11-13 15:04 ` [PATCH v1 24/61] NFSD: Replace READ* macros in nfsd4_decode_readdir() Chuck Lever
2020-11-13 15:04 ` [PATCH v1 25/61] NFSD: Replace READ* macros in nfsd4_decode_remove() Chuck Lever
2020-11-13 15:04 ` [PATCH v1 26/61] NFSD: Replace READ* macros in nfsd4_decode_rename() Chuck Lever
2020-11-13 15:04 ` [PATCH v1 27/61] NFSD: Replace READ* macros in nfsd4_decode_renew() Chuck Lever
2020-11-13 15:04 ` [PATCH v1 28/61] NFSD: Replace READ* macros in nfsd4_decode_secinfo() Chuck Lever
2020-11-13 15:04 ` [PATCH v1 29/61] NFSD: Replace READ* macros in nfsd4_decode_setclientid() Chuck Lever
2020-11-13 15:05 ` [PATCH v1 30/61] NFSD: Replace READ* macros in nfsd4_decode_setclientid_confirm() Chuck Lever
2020-11-13 15:05 ` [PATCH v1 31/61] NFSD: Replace READ* macros in nfsd4_decode_verify() Chuck Lever
2020-11-13 15:05 ` [PATCH v1 32/61] NFSD: Replace READ* macros in nfsd4_decode_write() Chuck Lever
2020-11-13 15:05 ` [PATCH v1 33/61] NFSD: Replace READ* macros in nfsd4_decode_release_lockowner() Chuck Lever
2020-11-13 15:05 ` [PATCH v1 34/61] NFSD: Replace READ* macros in nfsd4_decode_cb_sec() Chuck Lever
2020-11-13 15:05 ` [PATCH v1 35/61] NFSD: Replace READ* macros in nfsd4_decode_backchannel_ctl() Chuck Lever
2020-11-13 15:05 ` [PATCH v1 36/61] NFSD: Replace READ* macros in nfsd4_decode_bind_conn_to_session() Chuck Lever
2020-11-13 15:05 ` [PATCH v1 37/61] NFSD: Add a separate decoder to handle state_protect_ops Chuck Lever
2020-11-13 15:05 ` [PATCH v1 38/61] NFSD: Add a separate decoder for ssv_sp_parms Chuck Lever
2020-11-13 15:05 ` Chuck Lever [this message]
2020-11-13 15:05 ` [PATCH v1 40/61] NFSD: Replace READ* macros in nfsd4_decode_exchange_id() Chuck Lever
2020-11-13 15:05 ` [PATCH v1 41/61] NFSD: Replace READ* macros in nfsd4_decode_create_session() Chuck Lever
2020-11-13 15:06 ` [PATCH v1 42/61] NFSD: Replace READ* macros in nfsd4_decode_destroy_session() Chuck Lever
2020-11-13 15:06 ` [PATCH v1 43/61] NFSD: Replace READ* macros in nfsd4_decode_free_stateid() Chuck Lever
2020-11-13 15:06 ` [PATCH v1 44/61] NFSD: Replace READ* macros in nfsd4_decode_getdeviceinfo() Chuck Lever
2020-11-13 15:06 ` [PATCH v1 45/61] NFSD: Replace READ* macros in nfsd4_decode_layoutcommit() Chuck Lever
2020-11-13 15:06 ` [PATCH v1 46/61] NFSD: Replace READ* macros in nfsd4_decode_layoutget() Chuck Lever
2020-11-13 15:06 ` [PATCH v1 47/61] NFSD: Replace READ* macros in nfsd4_decode_layoutreturn() Chuck Lever
2020-11-13 15:06 ` [PATCH v1 48/61] NFSD: Replace READ* macros in nfsd4_decode_secinfo_no_name() Chuck Lever
2020-11-13 15:06 ` [PATCH v1 49/61] NFSD: Replace READ* macros in nfsd4_decode_sequence() Chuck Lever
2020-11-13 15:06 ` [PATCH v1 50/61] NFSD: Replace READ* macros in nfsd4_decode_test_stateid() Chuck Lever
2020-11-13 15:06 ` [PATCH v1 51/61] NFSD: Replace READ* macros in nfsd4_decode_destroy_clientid() Chuck Lever
2020-11-13 15:06 ` [PATCH v1 52/61] NFSD: Replace READ* macros in nfsd4_decode_reclaim_complete() Chuck Lever
2020-11-13 15:07 ` [PATCH v1 53/61] NFSD: Replace READ* macros in nfsd4_decode_fallocate() Chuck Lever
2020-11-13 15:07 ` [PATCH v1 54/61] NFSD: Replace READ* macros in nfsd4_decode_clone() Chuck Lever
2020-11-13 15:07 ` [PATCH v1 55/61] NFSD: Replace READ* macros in nfsd4_decode_copy() Chuck Lever
2020-11-13 15:07 ` [PATCH v1 56/61] NFSD: Replace READ* macros in nfsd4_decode_seek() Chuck Lever
2020-11-13 15:07 ` [PATCH v1 57/61] NFSD: Replace READ* macros in nfsd4_decode_xattr_name() Chuck Lever
2020-11-13 15:07 ` [PATCH v1 58/61] NFSD: Replace READ* macros in nfsd4_decode_setxattr() Chuck Lever
2020-11-13 15:07 ` [PATCH v1 59/61] NFSD: Replace READ* macros in nfsd4_decode_listxattrs() Chuck Lever
2020-11-13 15:07 ` [PATCH v1 60/61] NFSD: Replace READ* macros in nfsd4_decode_compound() Chuck Lever
2020-11-13 15:07 ` [PATCH v1 61/61] NFSD: Remove macros that are no longer used Chuck Lever
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=160527994831.6186.7016565184206978517.stgit@klimt.1015granger.net \
--to=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 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).