1 files changed, 9 insertions, 3 deletions

diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
index 8513c598fabf..9a41d3ddd8df 100644
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@@ -295,13 +295,19 @@ svc_expkey_update(struct cache_detail *cd, struct svc_expkey *new,
 
 static void nfsd4_fslocs_free(struct nfsd4_fs_locations *fsloc)
 {
+        struct nfsd4_fs_location *locations = fsloc->locations;
         int i;
 
+        if (!locations)
+                return;
+
         for (i = 0; i < fsloc->locations_count; i++) {
-                kfree(fsloc->locations[i].path);
-                kfree(fsloc->locations[i].hosts);
+                kfree(locations[i].path);
+                kfree(locations[i].hosts);
         }
-        kfree(fsloc->locations);
+
+        kfree(locations);
+        fsloc->locations = NULL;
 }
 
 static void svc_export_put(struct kref *ref)