Changeset 61844 in vbox

Timestamp:

Jun 23, 2016 10:50:04 AM (9 years ago)

Author:

vboxsync

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

108253

Message:

Storage/VMDK: Fix corrupting stream optimized VMDK images on first non readonly opening where the descriptor space is increased but the descriptor size in the image file is not updated

File:

• trunk/src/VBox/Storage/VMDK.cpp (modified) (1 diff)

trunk/src/VBox/Storage/VMDK.cpp

@@ -3085 +3085 @@
             &&  (!pExtent->uSectorRGD || (int64_t)pExtent->uSectorRGD - pExtent->uDescriptorSector >= 4))
         {
+            uint64_t cDescriptorSectorsOld = pExtent->cDescriptorSectors;
+
             pExtent->cDescriptorSectors = 4;
-            pExtent->fMetaDirty = true;
+            /*
+             * Update the on disk number now to make sure we don't introduce inconsistencies
+             * in case of stream optimized images from VMware where the descriptor is just
+             * one sector big (the binary header is not written to disk for complete
+             * stream optimized images in vmdkFlushImage()).
+             */
+            uint64_t u64DescSizeNew = RT_H2LE_U64(pExtent->cDescriptorSectors);
+            rc = vdIfIoIntFileWriteSync(pImage->pIfIo, pFile->pStorage, RT_OFFSETOF(SparseExtentHeader, descriptorSize),
+                                        &u64DescSizeNew, sizeof(u64DescSizeNew));
+            if (RT_FAILURE(rc))
+            {
+                LogFlowFunc(("Increasing the descriptor size failed with %Rrc\n", rc));
+                /* Restore the old size and carry on. */
+                pExtent->cDescriptorSectors = cDescriptorSectorsOld;
+            }
         }
         /* Read the descriptor from the extent. */