openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

NFSD: Replace READ* macros in nfsd4_decode_verify() 

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Chuck Lever 2020-11-03 14:40:32 -05:00
parent d1ca55149d
commit 67cd453eed
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fs/nfsd/nfs4xdr.c
View File

@ -1370,20 +1370,27 @@ nfsd4_decode_setclientid_confirm(struct nfsd4_compoundargs *argp, struct nfsd4_s
static __be32 static __be32
nfsd4_decode_verify(struct nfsd4_compoundargs *argp, struct nfsd4_verify *verify) nfsd4_decode_verify(struct nfsd4_compoundargs *argp, struct nfsd4_verify *verify)
{ {
DECODE_HEAD; __be32 *p, status;
if ((status = nfsd4_decode_bitmap(argp, verify->ve_bmval))) status = nfsd4_decode_bitmap4(argp, verify->ve_bmval,
goto out; ARRAY_SIZE(verify->ve_bmval));
if (status)
return status;
/* For convenience's sake, we compare raw xdr'd attributes in /* For convenience's sake, we compare raw xdr'd attributes in
* nfsd4_proc_verify */ * nfsd4_proc_verify */
READ_BUF(4); if (xdr_stream_decode_u32(argp->xdr, &verify->ve_attrlen) < 0)
verify->ve_attrlen = be32_to_cpup(p++); return nfserr_bad_xdr;
READ_BUF(verify->ve_attrlen); p = xdr_inline_decode(argp->xdr, verify->ve_attrlen);
SAVEMEM(verify->ve_attrval, verify->ve_attrlen); if (!p)
return nfserr_bad_xdr;
verify->ve_attrval = svcxdr_tmpalloc(argp, verify->ve_attrlen);
if (!verify->ve_attrval)
return nfserr_jukebox;
memcpy(verify->ve_attrval, p, verify->ve_attrlen);
DECODE_TAIL; return nfs_ok;
} }
static __be32 static __be32