NFSD: Replace READ* macros that decode the fattr4 size attribute
authorChuck Lever <chuck.lever@oracle.com>
Thu, 19 Nov 2020 18:47:16 +0000 (13:47 -0500)
committerChuck Lever <chuck.lever@oracle.com>
Mon, 30 Nov 2020 19:46:36 +0000 (14:46 -0500)
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
fs/nfsd/nfs4xdr.c

index cd114e9..7d7efb9 100644 (file)
@@ -273,8 +273,11 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,
        starting_pos = xdr_stream_pos(argp->xdr);
 
        if (bmval[0] & FATTR4_WORD0_SIZE) {
-               READ_BUF(8);
-               p = xdr_decode_hyper(p, &iattr->ia_size);
+               u64 size;
+
+               if (xdr_stream_decode_u64(argp->xdr, &size) < 0)
+                       return nfserr_bad_xdr;
+               iattr->ia_size = size;
                iattr->ia_valid |= ATTR_SIZE;
        }
        if (bmval[0] & FATTR4_WORD0_ACL) {