summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Mayhew <smayhew@redhat.com>2018-11-08 11:11:36 -0500
committerJ. Bruce Fields <bfields@redhat.com>2018-11-08 12:11:45 -0500
commit01310bb7c9c98752cc763b36532fab028e0f8f81 (patch)
tree7d3ee070317b029e9f6b31ceeca8a96a4191afc4
parent5d7a5bcb67c70cbc904057ef52d3fcfeb24420bb (diff)
downloadblackbird-obmc-linux-01310bb7c9c98752cc763b36532fab028e0f8f81.tar.gz
blackbird-obmc-linux-01310bb7c9c98752cc763b36532fab028e0f8f81.zip
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>
-rw-r--r--fs/nfsd/nfs4proc.c3
1 files changed, 3 insertions, 0 deletions
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) {
OpenPOWER on IntegriCloud