From: Chuck Lever <chuck.lever@oracle.com>
Date: Thu, 19 Nov 2020 18:47:16 +0000 (-0500)
Subject: NFSD: Replace READ* macros that decode the fattr4 size attribute
X-Git-Tag: v5.10.220~752
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ee02662724e31d372c4cd755039a8511b57db4a1;p=thirdparty%2Fkernel%2Fstable.git

NFSD: Replace READ* macros that decode the fattr4 size attribute

[ Upstream commit 2ac1b9b2afbbacf597dbec722b23b6be62e4e41e ]

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index de5ac334cb8ab..5ec0c2dac3348 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -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) {