Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx>
---
fs/nfsd/nfs4xdr.c | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 9afdb83c5c23..7e969f04f62f 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -1968,20 +1968,26 @@ nfsd4_decode_fallocate(struct nfsd4_compoundargs *argp,
static __be32
nfsd4_decode_clone(struct nfsd4_compoundargs *argp, struct nfsd4_clone *clone)
{
- DECODE_HEAD;
+ __be32 status;
status = nfsd4_decode_stateid4(argp, &clone->cl_src_stateid);
if (status)
return status;
status = nfsd4_decode_stateid4(argp, &clone->cl_dst_stateid);
if (status)
- return status;
+ goto out;
+ if (xdr_stream_decode_u64(argp->xdr, &clone->cl_src_pos) < 0)
+ goto xdr_error;
+ if (xdr_stream_decode_u64(argp->xdr, &clone->cl_dst_pos) < 0)
+ goto xdr_error;
+ if (xdr_stream_decode_u64(argp->xdr, &clone->cl_count) < 0)
+ goto xdr_error;
- READ_BUF(8 + 8 + 8);
- p = xdr_decode_hyper(p, &clone->cl_src_pos);
- p = xdr_decode_hyper(p, &clone->cl_dst_pos);
- p = xdr_decode_hyper(p, &clone->cl_count);
- DECODE_TAIL;
+ status = nfs_ok;
+out:
+ return status;
+xdr_error:
+ return nfserr_bad_xdr;
}
static __be32 nfsd4_decode_nl4_server(struct nfsd4_compoundargs *argp,
