fs: fix parsing of end records

End records have no data, just a type, so don't try to read anything beyond the type. Signed-off-by: Hans Holmberg <[email protected]>
westerndigitalcorporation · Apr 30, 2021 · 76101d1 · 76101d1
1 parent 1b2f42c
commit 76101d1
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/fs/fs_zenfs.cc b/fs/fs_zenfs.cc
@@ -751,8 +751,11 @@ Status ZenFS::RecoverFrom(ZenMetaLog* log) {
 
     if (!GetFixed32(&record, &tag)) break;
 
-    if (!GetLengthPrefixedSlice(&record, &data))
+    if (tag == kEndRecord) break;
+
+    if (!GetLengthPrefixedSlice(&record, &data)) {
       return Status::Corruption("ZenFS", "No recovery record data");
+    }
 
     switch (tag) {
       case kCompleteFilesSnapshot:
@@ -784,10 +787,6 @@ Status ZenFS::RecoverFrom(ZenMetaLog* log) {
         }
         break;
 
-      case kEndRecord:
-        done = true;
-        break;
-
       default:
         Warn(logger_, "Unexpected metadata record tag: %u", tag);
         return Status::Corruption("ZenFS", "Unexpected tag");