From: Chuck Lever <chuck.lever@oracle.com>
Date: Wed, 21 Oct 2020 16:34:24 +0000 (-0400)
Subject: NFSD: Update the NFSv2 LINK argument decoder to use struct xdr_stream
X-Git-Tag: v5.10.220~610
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ebfb21605f1af172fe47710c41e10fd778f75ff5;p=thirdparty%2Fkernel%2Fstable.git

NFSD: Update the NFSv2 LINK argument decoder to use struct xdr_stream

[ Upstream commit 77edcdf91f6245a9881b84e4e101738148bd039a ]

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

diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c
index d4f4729c7b1c0..3d0fe03a3fb94 100644
--- a/fs/nfsd/nfsxdr.c
+++ b/fs/nfsd/nfsxdr.c
@@ -356,14 +356,12 @@ nfssvc_decode_renameargs(struct svc_rqst *rqstp, __be32 *p)
 int
 nfssvc_decode_linkargs(struct svc_rqst *rqstp, __be32 *p)
 {
+	struct xdr_stream *xdr = &rqstp->rq_arg_stream;
 	struct nfsd_linkargs *args = rqstp->rq_argp;
 
-	if (!(p = decode_fh(p, &args->ffh))
-	 || !(p = decode_fh(p, &args->tfh))
-	 || !(p = decode_filename(p, &args->tname, &args->tlen)))
-		return 0;
-
-	return xdr_argsize_check(rqstp, p);
+	return svcxdr_decode_fhandle(xdr, &args->ffh) &&
+		svcxdr_decode_diropargs(xdr, &args->tfh,
+					&args->tname, &args->tlen);
 }
 
 int