From: Chuck Lever <chuck.lever@oracle.com>
Date: Wed, 4 Nov 2020 20:01:24 +0000 (-0500)
Subject: NFSD: Replace READ* macros in nfsd4_decode_link()
X-Git-Tag: v5.10.220~740
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=84bc365eee7f55c32b07c0f7b904aea2da5cc4e3;p=thirdparty%2Fkernel%2Fstable.git

NFSD: Replace READ* macros in nfsd4_decode_link()

[ Upstream commit 5c505d128691c70991b766dd6a3faf49fa59ecfb ]

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 70ce48340c1b7..4596b8cef222c 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -779,16 +779,7 @@ nfsd4_decode_getattr(struct nfsd4_compoundargs *argp, struct nfsd4_getattr *geta
 static __be32
 nfsd4_decode_link(struct nfsd4_compoundargs *argp, struct nfsd4_link *link)
 {
-	DECODE_HEAD;
-
-	READ_BUF(4);
-	link->li_namelen = be32_to_cpup(p++);
-	READ_BUF(link->li_namelen);
-	SAVEMEM(link->li_name, link->li_namelen);
-	if ((status = check_filename(link->li_name, link->li_namelen)))
-		return status;
-
-	DECODE_TAIL;
+	return nfsd4_decode_component4(argp, &link->li_name, &link->li_namelen);
 }
 
 static __be32