[v2,030/118] NFSD: Add helper to decode NFSv4 verifiers

Message ID	160590458582.1340.15461865911567448466.stgit@klimt.1015granger.net (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-nfs-owner@kernel.org> Sender: Chuck Lever <chucklever@gmail.com> Subject: [PATCH v2 030/118] NFSD: Add helper to decode NFSv4 verifiers From: Chuck Lever <chuck.lever@oracle.com> To: linux-nfs@vger.kernel.org Date: Fri, 20 Nov 2020 15:36:25 -0500 Message-ID: <160590458582.1340.15461865911567448466.stgit@klimt.1015granger.net> In-Reply-To: <160590425404.1340.8850646771948736468.stgit@klimt.1015granger.net> References: <160590425404.1340.8850646771948736468.stgit@klimt.1015granger.net> User-Agent: StGit/0.23-29-ga622f1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk
Series	Update NFSD XDR functions \| expand [v2,000/118] Update NFSD XDR functions [v2,001/118] NFSD: Fix returned READDIR offset cookie [v2,002/118] SUNRPC: Add xdr_set_scratch_page() and xdr_reset_scratch_buffer() [v2,003/118] SUNRPC: Prepare for xdr_stream-style decoding on the server-side [v2,004/118] NFSD: Add common helpers to decode void args and encode void results [v2,005/118] NFSD: Replace the internals of the READ_BUF() macro [v2,006/118] NFSD: Replace READ* macros in nfsd4_decode_access() [v2,007/118] NFSD: Replace READ* macros in nfsd4_decode_stateid() [v2,008/118] NFSD: Replace READ* macros in nfsd4_decode_close() [v2,009/118] NFSD: Replace READ* macros in nfsd4_decode_commit() [v2,010/118] NFSD: Change the way the expected length of a fattr4 is checked [v2,011/118] NFSD: Replace READ* macros that decode the fattr4 size attribute [v2,012/118] NFSD: Replace READ* macros that decode the fattr4 acl attribute [v2,013/118] NFSD: Replace READ* macros that decode the fattr4 mode attribute [v2,014/118] NFSD: Replace READ* macros that decode the fattr4 owner attribute [v2,015/118] NFSD: Replace READ* macros that decode the fattr4 owner_group attribute [v2,016/118] NFSD: Replace READ* macros that decode the fattr4 time_set attributes [v2,017/118] NFSD: Replace READ* macros that decode the fattr4 security label attribute [v2,018/118] NFSD: Replace READ* macros that decode the fattr4 umask attribute [v2,019/118] NFSD: Replace READ* macros in nfsd4_decode_fattr() [v2,020/118] NFSD: Replace READ* macros in nfsd4_decode_create() [v2,021/118] NFSD: Replace READ* macros in nfsd4_decode_getattr() [v2,022/118] NFSD: Replace READ* macros in nfsd4_decode_link() [v2,023/118] NFSD: Relocate nfsd4_decode_opaque() [v2,024/118] NFSD: Add helpers to decode a clientid4 and an NFSv4 state owner [v2,025/118] NFSD: Add helper for decoding locker4 [v2,026/118] NFSD: Replace READ* macros in nfsd4_decode_lock() [v2,027/118] NFSD: Replace READ* macros in nfsd4_decode_lockt() [v2,028/118] NFSD: Replace READ* macros in nfsd4_decode_locku() [v2,029/118] NFSD: Replace READ* macros in nfsd4_decode_lookup() [v2,030/118] NFSD: Add helper to decode NFSv4 verifiers [v2,031/118] NFSD: Add helper to decode OPEN's createhow4 argument [v2,032/118] NFSD: Add helper to decode OPEN's openflag4 argument [v2,033/118] NFSD: Replace READ* macros in nfsd4_decode_share_access() [v2,034/118] NFSD: Replace READ* macros in nfsd4_decode_share_deny() [v2,035/118] NFSD: Add helper to decode OPEN's open_claim4 argument [v2,036/118] NFSD: Replace READ* macros in nfsd4_decode_open() [v2,037/118] NFSD: Replace READ* macros in nfsd4_decode_open_confirm() [v2,038/118] NFSD: Replace READ* macros in nfsd4_decode_open_downgrade() [v2,039/118] NFSD: Replace READ* macros in nfsd4_decode_putfh() [v2,040/118] NFSD: Replace READ* macros in nfsd4_decode_read() [v2,041/118] NFSD: Replace READ* macros in nfsd4_decode_readdir() [v2,042/118] NFSD: Replace READ* macros in nfsd4_decode_remove() [v2,043/118] NFSD: Replace READ* macros in nfsd4_decode_rename() [v2,044/118] NFSD: Replace READ* macros in nfsd4_decode_renew() [v2,045/118] NFSD: Replace READ* macros in nfsd4_decode_secinfo() [v2,046/118] NFSD: Replace READ* macros in nfsd4_decode_setclientid() [v2,047/118] NFSD: Replace READ* macros in nfsd4_decode_setclientid_confirm() [v2,048/118] NFSD: Replace READ* macros in nfsd4_decode_verify() [v2,049/118] NFSD: Replace READ* macros in nfsd4_decode_write() [v2,050/118] NFSD: Replace READ* macros in nfsd4_decode_release_lockowner() [v2,051/118] NFSD: Replace READ* macros in nfsd4_decode_cb_sec() [v2,052/118] NFSD: Replace READ* macros in nfsd4_decode_backchannel_ctl() [v2,053/118] NFSD: Replace READ* macros in nfsd4_decode_bind_conn_to_session() [v2,054/118] NFSD: Add a separate decoder to handle state_protect_ops [v2,055/118] NFSD: Add a separate decoder for ssv_sp_parms [v2,056/118] NFSD: Add a helper to decode state_protect4_a [v2,057/118] NFSD: Add a helper to decode nfs_impl_id4 [v2,058/118] NFSD: Add a helper to decode channel_attrs4 [v2,059/118] NFSD: Replace READ* macros in nfsd4_decode_create_session() [v2,060/118] NFSD: Replace READ* macros in nfsd4_decode_destroy_session() [v2,061/118] NFSD: Replace READ* macros in nfsd4_decode_free_stateid() [v2,062/118] NFSD: Replace READ* macros in nfsd4_decode_getdeviceinfo() [v2,063/118] NFSD: Replace READ* macros in nfsd4_decode_layoutcommit() [v2,064/118] NFSD: Replace READ* macros in nfsd4_decode_layoutget() [v2,065/118] NFSD: Replace READ* macros in nfsd4_decode_layoutreturn() [v2,066/118] NFSD: Replace READ* macros in nfsd4_decode_secinfo_no_name() [v2,067/118] NFSD: Replace READ* macros in nfsd4_decode_sequence() [v2,068/118] NFSD: Replace READ* macros in nfsd4_decode_test_stateid() [v2,069/118] NFSD: Replace READ* macros in nfsd4_decode_destroy_clientid() [v2,070/118] NFSD: Replace READ* macros in nfsd4_decode_reclaim_complete() [v2,071/118] NFSD: Replace READ* macros in nfsd4_decode_fallocate() [v2,072/118] NFSD: Replace READ* macros in nfsd4_decode_clone() [v2,073/118] NFSD: Replace READ* macros in nfsd4_decode_nl4_server() [v2,074/118] NFSD: Replace READ* macros in nfsd4_decode_copy() [v2,075/118] NFSD: Replace READ* macros in nfsd4_decode_seek() [v2,076/118] NFSD: Replace READ* macros in nfsd4_decode_xattr_name() [v2,077/118] NFSD: Replace READ* macros in nfsd4_decode_setxattr() [v2,078/118] NFSD: Replace READ* macros in nfsd4_decode_listxattrs() [v2,079/118] NFSD: Replace READ* macros in nfsd4_decode_compound() [v2,080/118] NFSD: Remove macros that are no longer used [v2,081/118] NFSD: Update GETATTR3args decoder to use struct xdr_stream [v2,082/118] NFSD: Update ACCESS3arg decoder to use struct xdr_stream [v2,083/118] NFSD: Update READ3arg decoder to use struct xdr_stream [v2,084/118] NFSD: Update WRITE3arg decoder to use struct xdr_stream [v2,085/118] NFSD: Update READLINK3arg decoder to use struct xdr_stream [v2,086/118] NFSD: Add helper to set up the pages where the dirlist is encoded [v2,087/118] NFSD: Update READDIR3args decoders to use struct xdr_stream [v2,088/118] NFSD: Update COMMIT3arg decoder to use struct xdr_stream [v2,089/118] NFSD: Update the NFSv3 DIROPargs decoder to use struct xdr_stream [v2,090/118] NFSD: Update the RENAME3args decoder to use struct xdr_stream [v2,091/118] NFSD: Update the LINK3args decoder to use struct xdr_stream [v2,092/118] NFSD: Update the SETATTR3args decoder to use struct xdr_stream [v2,093/118] NFSD: Update the CREATE3args decoder to use struct xdr_stream [v2,094/118] NFSD: Update the MKDIR3args decoder to use struct xdr_stream [v2,095/118] NFSD: Update the SYMLINK3args decoder to use struct xdr_stream [v2,096/118] NFSD: Update the MKNOD3args decoder to use struct xdr_stream [v2,097/118] NFSD: Update the NFSv2 GETATTR argument decoder to use struct xdr_stream [v2,098/118] NFSD: Update the NFSv2 READ argument decoder to use struct xdr_stream [v2,099/118] NFSD: Update the NFSv2 WRITE argument decoder to use struct xdr_stream [v2,100/118] NFSD: Update the NFSv2 READLINK argument decoder to use struct xdr_stream [v2,101/118] NFSD: Add helper to set up the pages where the dirlist is encoded [v2,102/118] NFSD: Update the NFSv2 READDIR argument decoder to use struct xdr_stream [v2,103/118] NFSD: Update NFSv2 diropargs decoding to use struct xdr_stream [v2,104/118] NFSD: Update the NFSv2 RENAME argument decoder to use struct xdr_stream [v2,105/118] NFSD: Update the NFSv2 LINK argument decoder to use struct xdr_stream [v2,106/118] NFSD: Update the NFSv2 SETATTR argument decoder to use struct xdr_stream [v2,107/118] NFSD: Update the NFSv2 CREATE argument decoder to use struct xdr_stream [v2,108/118] NFSD: Update the NFSv2 SYMLINK argument decoder to use struct xdr_stream [v2,109/118] NFSD: Remove argument length checking in nfsd_dispatch() [v2,110/118] NFSD: Update the NFSv2 GETACL argument decoder to use struct xdr_stream [v2,111/118] NFSD: Add an xdr_stream-based decoder for NFSv2/3 ACLs [v2,112/118] NFSD: Update the NFSv2 SETACL argument decoder to use struct xdr_stream [v2,113/118] NFSD: Update the NFSv2 ACL GETATTR argument decoder to use struct xdr_stream [v2,114/118] NFSD: Update the NFSv2 ACL ACCESS argument decoder to use struct xdr_stream [v2,115/118] NFSD: Clean up after updating NFSv2 ACL decoders [v2,116/118] NFSD: Update the NFSv3 GETACL argument decoder to use struct xdr_stream [v2,117/118] NFSD: Update the NFSv2 SETACL argument decoder to use struct xdr_stream [v2,118/118] NFSD: Clean up after updating NFSv3 ACL decoders

Message ID

160590458582.1340.15461865911567448466.stgit@klimt.1015granger.net (mailing list archive)

State

New, archived

Headers

Sender: Chuck Lever <chucklever@gmail.com>
Subject: [PATCH v2 030/118] NFSD: Add helper to decode NFSv4 verifiers
From: Chuck Lever <chuck.lever@oracle.com>
To: linux-nfs@vger.kernel.org
Date: Fri, 20 Nov 2020 15:36:25 -0500
Message-ID: 
 <160590458582.1340.15461865911567448466.stgit@klimt.1015granger.net>
In-Reply-To: 
 <160590425404.1340.8850646771948736468.stgit@klimt.1015granger.net>
References: 
 <160590425404.1340.8850646771948736468.stgit@klimt.1015granger.net>
User-Agent: StGit/0.23-29-ga622f1
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Precedence: bulk

Series

Update NFSD XDR functions | expand

Commit Message

Chuck Lever Nov. 20, 2020, 8:36 p.m. UTC

This helper will be used to simplify decoders in subsequent
patches.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 fs/nfsd/nfs4xdr.c |   22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 2fe719f64ec9..1bbb637d4625 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -282,6 +282,18 @@  nfsd4_decode_nfstime4(struct nfsd4_compoundargs *argp, struct timespec64 *tv)
 	return nfs_ok;
 }
 
+static __be32
+nfsd4_decode_verifier4(struct nfsd4_compoundargs *argp, nfs4_verifier *verf)
+{
+	__be32 *p;
+
+	p = xdr_inline_decode(argp->xdr, NFS4_VERIFIER_SIZE);
+	if (!p)
+		return nfserr_bad_xdr;
+	memcpy(verf->data, p, sizeof(verf->data));
+	return nfs_ok;
+}
+
 static __be32
 nfsd4_decode_bitmap(struct nfsd4_compoundargs *argp, u32 *bmval)
 {
@@ -994,14 +1006,16 @@  nfsd4_decode_open(struct nfsd4_compoundargs *argp, struct nfsd4_open *open)
 				goto out;
 			break;
 		case NFS4_CREATE_EXCLUSIVE:
-			READ_BUF(NFS4_VERIFIER_SIZE);
-			COPYMEM(open->op_verf.data, NFS4_VERIFIER_SIZE);
+			status = nfsd4_decode_verifier4(argp, &open->op_verf);
+			if (status)
+				return status;
 			break;
 		case NFS4_CREATE_EXCLUSIVE4_1:
 			if (argp->minorversion < 1)
 				goto xdr_error;
-			READ_BUF(NFS4_VERIFIER_SIZE);
-			COPYMEM(open->op_verf.data, NFS4_VERIFIER_SIZE);
+			status = nfsd4_decode_verifier4(argp, &open->op_verf);
+			if (status)
+				return status;
 			status = nfsd4_decode_fattr4(argp, open->op_bmval,
 						     ARRAY_SIZE(open->op_bmval),
 						     &open->op_iattr, &open->op_acl,

[v2,030/118] NFSD: Add helper to decode NFSv4 verifiers

Commit Message

Patch