From: Scott Mayhew <smayhew@redhat.com>
Date: Thu, 8 Nov 2018 16:11:36 +0000 (-0500)
Subject: nfsd: COPY and CLONE operations require the saved filehandle to be set
X-Git-Tag: rel_imx_5.10.35_2.0.0-somdevices.0~5916^2~1
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=01310bb7c9c98752cc763b36532fab028e0f8f81;p=linux.git

nfsd: COPY and CLONE operations require the saved filehandle to be set

Make sure we have a saved filehandle, otherwise we'll oops with a null
pointer dereference in nfs4_preprocess_stateid_op().

Signed-off-by: Scott Mayhew <smayhew@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
---

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index edff074d38c7..d505990dac7c 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -1038,6 +1038,9 @@ nfsd4_verify_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
 {
 	__be32 status;
 
+	if (!cstate->save_fh.fh_dentry)
+		return nfserr_nofilehandle;
+
 	status = nfs4_preprocess_stateid_op(rqstp, cstate, &cstate->save_fh,
 					    src_stateid, RD_STATE, src, NULL);
 	if (status) {