1 files changed, 8 insertions, 2 deletions

diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c
index 5de03ec20144..a090bbe6ee29 100644
--- a/fs/cifs/readdir.c
+++ b/fs/cifs/readdir.c
@@ -554,7 +554,10 @@ static int find_cifs_entry(const int xid, struct cifs_tcon *pTcon,
                                  rc);
                         return rc;
                 }
-                cifs_save_resume_key(cifsFile->srch_inf.last_entry, cifsFile);
+                /* FindFirst/Next set last_entry to NULL on malformed reply */
+                if (cifsFile->srch_inf.last_entry)
+                        cifs_save_resume_key(cifsFile->srch_inf.last_entry,
+                                                cifsFile);
         }
 
         while ((index_to_find >= cifsFile->srch_inf.index_of_last_entry) &&
@@ -562,7 +565,10 @@ static int find_cifs_entry(const int xid, struct cifs_tcon *pTcon,
                 cFYI(1, "calling findnext2");
                 rc = CIFSFindNext(xid, pTcon, cifsFile->netfid,
                                   &cifsFile->srch_inf);
-                cifs_save_resume_key(cifsFile->srch_inf.last_entry, cifsFile);
+                /* FindFirst/Next set last_entry to NULL on malformed reply */
+                if (cifsFile->srch_inf.last_entry)
+                        cifs_save_resume_key(cifsFile->srch_inf.last_entry,
+                                                cifsFile);
                 if (rc)
                         return -ENOENT;
         }