Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NFSD: Add helper to decode NFSv4 verifiers

Browse source 
[ Upstream commit 796dd1c6b680959ac968b52aa507911b288b1749 ]

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

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Chuck Lever 2020-11-16 17:34:01 -05:00 • committed by Ksawlii
parent 49c5f4f27e
commit 4cb9382c5f
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
fs/nfsd/nfs4xdr.c
View file

@ -284,6 +284,18 @@ nfsd4_decode_nfstime4(struct nfsd4_compoundargs *argp, struct timespec64 *tv)
return nfs_ok; 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 static __be32
nfsd4_decode_bitmap(struct nfsd4_compoundargs *argp, u32 *bmval) nfsd4_decode_bitmap(struct nfsd4_compoundargs *argp, u32 *bmval)
{ {
@ -1047,14 +1059,16 @@ nfsd4_decode_open(struct nfsd4_compoundargs *argp, struct nfsd4_open *open)
goto out; goto out;
break; break;
case NFS4_CREATE_EXCLUSIVE: case NFS4_CREATE_EXCLUSIVE:
READ_BUF(NFS4_VERIFIER_SIZE); status = nfsd4_decode_verifier4(argp, &open->op_verf);
COPYMEM(open->op_verf.data, NFS4_VERIFIER_SIZE); if (status)
return status;
break; break;
case NFS4_CREATE_EXCLUSIVE4_1: case NFS4_CREATE_EXCLUSIVE4_1:
if (argp->minorversion < 1) if (argp->minorversion < 1)
goto xdr_error; goto xdr_error;
READ_BUF(NFS4_VERIFIER_SIZE); status = nfsd4_decode_verifier4(argp, &open->op_verf);
COPYMEM(open->op_verf.data, NFS4_VERIFIER_SIZE); if (status)
return status;
status = nfsd4_decode_fattr4(argp, open->op_bmval, status = nfsd4_decode_fattr4(argp, open->op_bmval,
ARRAY_SIZE(open->op_bmval), ARRAY_SIZE(open->op_bmval),
&open->op_iattr, &open->op_acl, &open->op_iattr, &open->op_acl,