Changeset 69619 in vbox

Timestamp:

Nov 8, 2017 3:46:10 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

118979

Message:

fatvfs: Relaxed idxEndOfChain (FAT entry #2) checks.

File:

• trunk/src/VBox/Runtime/common/fs/fatvfs.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/common/fs/fatvfs.cpp

@@ -5012 +5012 @@
         return RTErrInfoSetF(pErrInfo, VERR_VFS_BOGUS_FORMAT,
                              "Media byte and FAT ID mismatch: %#x vs %#x (%.7Rhxs)", pbFatSector[0], pThis->bMedia, pbFatSector);
+    uint32_t idxOurEndOfChain;
     switch (pThis->enmFatType)
     {
@@ -5019 +5020 @@
             pThis->idxMaxLastCluster = FAT_LAST_FAT12_DATA_CLUSTER;
             pThis->idxEndOfChain     = (pbFatSector[1] >> 4) | ((uint32_t)pbFatSector[2] << 4);
+            idxOurEndOfChain         = FAT_FIRST_FAT12_EOC;
             break;
 
@@ -5026 +5028 @@
             pThis->idxMaxLastCluster = FAT_LAST_FAT16_DATA_CLUSTER;
             pThis->idxEndOfChain     = RT_MAKE_U16(pbFatSector[2], pbFatSector[3]);
+            idxOurEndOfChain         = FAT_FIRST_FAT16_EOC;
             break;
 
@@ -5035 +5038 @@
             pThis->idxMaxLastCluster = FAT_LAST_FAT32_DATA_CLUSTER;
             pThis->idxEndOfChain     = RT_MAKE_U32_FROM_U8(pbFatSector[4], pbFatSector[5], pbFatSector[6], pbFatSector[7]);
+            idxOurEndOfChain         = FAT_FIRST_FAT32_EOC;
             break;
 
         default: AssertFailedReturn(VERR_INTERNAL_ERROR_2);
     }
+
     if (pThis->idxEndOfChain <= pThis->idxMaxLastCluster)
-        return RTErrInfoSetF(pErrInfo, VERR_VFS_BOGUS_FORMAT, "Bogus formatter end-of-chain value: %#x, must be above %#x",
-                             pThis->idxEndOfChain, pThis->idxMaxLastCluster);
+    {
+        Log(("rtFsFatVolTryInitDos2Plus: Bogus idxEndOfChain=%#x, using %#x instead\n", pThis->idxEndOfChain, idxOurEndOfChain));
+        pThis->idxEndOfChain = idxOurEndOfChain;
+    }
 
     RT_NOREF(pbFatSector);