Changeset 41447 in vbox for trunk/src/VBox/Storage

Timestamp:

May 25, 2012 12:02:11 PM (13 years ago)

Author:

vboxsync

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

78181

Message:

Storage/VHDX: Work around data alignment issues by allocating memory for theheaders dynamically + fix uuid handling

File:

• trunk/src/VBox/Storage/VHDX.cpp (modified) (5 diffs)

trunk/src/VBox/Storage/VHDX.cpp

@@ -625 +625 @@
 DECLINLINE(void) vhdxConvUuidEndianess(VHDXECONV enmConv, PRTUUID pUuidConv, PRTUUID pUuid)
 {
+#if 1
+    memcpy(pUuidConv, pUuid, sizeof(RTUUID));
+#else
     pUuidConv->Gen.u32TimeLow              = SET_ENDIAN_U32(pUuid->Gen.u32TimeLow);
     pUuidConv->Gen.u16TimeMid              = SET_ENDIAN_U16(pUuid->Gen.u16TimeMid);
@@ -632 +635 @@
     for (unsigned i = 0; i < RT_ELEMENTS(pUuidConv->Gen.au8Node); i++)
         pUuidConv->Gen.au8Node[i] = pUuid->Gen.au8Node[i];
+#endif
 }
 
@@ -1031 +1035 @@
 static int vhdxFindAndLoadCurrentHeader(PVHDXIMAGE pImage)
 {
-    VhdxHeader Hdr1, Hdr2;
+    PVhdxHeader pHdr1, pHdr2;
     uint32_t u32ChkSum = 0;
     uint32_t u32ChkSumSaved = 0;
@@ -1045 +1049 @@
      * sequence number and checksum fields in the header.
      */
-
-    /* Read the first header. */
-    rc = vdIfIoIntFileReadSync(pImage->pIfIo, pImage->pStorage, VHDX_HEADER1_OFFSET,
-                               &Hdr1, sizeof(Hdr1), NULL);
-    if (RT_SUCCESS(rc))
+    pHdr1 = (PVhdxHeader)RTMemAllocZ(sizeof(VhdxHeader));
+    pHdr2 = (PVhdxHeader)RTMemAllocZ(sizeof(VhdxHeader));
+
+    if (pHdr1 && pHdr2)
     {
-        vhdxConvHeaderEndianess(VHDXECONV_F2H, &Hdr1, &Hdr1);
-
-        /* Validate checksum. */
-        u32ChkSumSaved = Hdr1.u32Checksum;
-        Hdr1.u32Checksum = 0;
-        //u32ChkSum = RTCrc32C(&Hdr1, sizeof(Hdr1));
-
-        if (   Hdr1.u32Signature == VHDX_HEADER_SIGNATURE
-            /*&& u32ChkSum == u32ChkSumSaved*/)
-            fHdr1Valid = true;
+        /* Read the first header. */
+        rc = vdIfIoIntFileReadSync(pImage->pIfIo, pImage->pStorage, VHDX_HEADER1_OFFSET,
+                                   pHdr1, sizeof(*pHdr1), NULL);
+        if (RT_SUCCESS(rc))
+        {
+            vhdxConvHeaderEndianess(VHDXECONV_F2H, pHdr1, pHdr1);
+
+            /* Validate checksum. */
+            u32ChkSumSaved = pHdr1->u32Checksum;
+            pHdr1->u32Checksum = 0;
+            //u32ChkSum = RTCrc32C(pHdr1, sizeof(*pHdr1));
+
+            if (   pHdr1->u32Signature == VHDX_HEADER_SIGNATURE
+                /*&& u32ChkSum == u32ChkSumSaved*/)
+                fHdr1Valid = true;
+        }
+
+        /* Try to read the second header in any case (even if reading the first failed). */
+        rc = vdIfIoIntFileReadSync(pImage->pIfIo, pImage->pStorage, VHDX_HEADER2_OFFSET,
+                                   pHdr2, sizeof(*pHdr2), NULL);
+        if (RT_SUCCESS(rc))
+        {
+            vhdxConvHeaderEndianess(VHDXECONV_F2H, pHdr2, pHdr2);
+
+            /* Validate checksum. */
+            u32ChkSumSaved = pHdr2->u32Checksum;
+            pHdr2->u32Checksum = 0;
+            //u32ChkSum = RTCrc32C(pHdr2, sizeof(*pHdr2));
+
+            if (   pHdr2->u32Signature == VHDX_HEADER_SIGNATURE
+                /*&& u32ChkSum == u32ChkSumSaved*/)
+                fHdr2Valid = true;
+        }
+
+        /* Determine the current header. */
+        if (fHdr1Valid != fHdr2Valid)
+        {
+            /* Only one header is valid - use it. */
+            rc = vhdxLoadHeader(pImage, fHdr1Valid ? pHdr1 : pHdr2);
+        }
+        else if (!fHdr1Valid && !fHdr2Valid)
+        {
+            /* Crap, both headers are corrupt, refuse to load the image. */
+            rc = vdIfError(pImage->pIfError, VERR_VD_GEN_INVALID_HEADER, RT_SRC_POS,
+                           "VHDX: Can not load the image because both headers are corrupt");
+        }
+        else
+        {
+            /* Both headers are valid. Use the sequence number to find the current one. */
+            if (pHdr1->u64SequenceNumber > pHdr2->u64SequenceNumber)
+                rc = vhdxLoadHeader(pImage, pHdr1);
+            else
+                rc = vhdxLoadHeader(pImage, pHdr2);
+        }
     }
-
-    /* Try to read the second header in any case (even if reading the first failed). */
-    rc = vdIfIoIntFileReadSync(pImage->pIfIo, pImage->pStorage, VHDX_HEADER2_OFFSET,
-                               &Hdr2, sizeof(Hdr2), NULL);
-    if (RT_SUCCESS(rc))
-    {
-        vhdxConvHeaderEndianess(VHDXECONV_F2H, &Hdr2, &Hdr2);
-
-        /* Validate checksum. */
-        u32ChkSumSaved = Hdr2.u32Checksum;
-        Hdr2.u32Checksum = 0;
-        //u32ChkSum = RTCrc32C(&Hdr2, sizeof(Hdr2));
-
-        if (   Hdr2.u32Signature == VHDX_HEADER_SIGNATURE
-            /*&& u32ChkSum == u32ChkSumSaved*/)
-            fHdr2Valid = true;
-    }
-
-    /* Determine the current header. */
-    if (fHdr1Valid != fHdr2Valid)
-    {
-        /* Only one header is valid - use it. */
-        rc = vhdxLoadHeader(pImage, fHdr1Valid ? &Hdr1 : &Hdr2);
-    }
-    else if (!fHdr1Valid && !fHdr2Valid)
-    {
-        /* Crap, both headers are corrupt, refuse to load the image. */
-        rc = vdIfError(pImage->pIfError, VERR_VD_GEN_INVALID_HEADER, RT_SRC_POS,
-                       "VHDX: Can not load the image because both headers are corrupt");
-    }
-    else
-    {
-        /* Both headers are valid. Use the sequence number to find the current one. */
-        if (Hdr1.u64SequenceNumber > Hdr2.u64SequenceNumber)
-            rc = vhdxLoadHeader(pImage, &Hdr1);
-        else
-            rc = vhdxLoadHeader(pImage, &Hdr2);
-    }
+    else
+        rc = vdIfError(pImage->pIfError, VERR_NO_MEMORY, RT_SRC_POS,
+                       "VHDX: Out of memory while allocating memory for the header");
+
+    if (pHdr1)
+        RTMemFree(pHdr1);
+    if (pHdr2)
+        RTMemFree(pHdr2);
 
     LogFlowFunc(("returns rc=%Rrc\n", rc));
@@ -2374 +2391 @@
     if (pImage)
     {
-        vdIfErrorMessage(pImage->pIfError, "Header: Geometry PCHS=%u/%u/%u LCHS=%u/%u/%u cbSector=%llu\n",
+        vdIfErrorMessage(pImage->pIfError, "Header: Geometry PCHS=%u/%u/%u LCHS=%u/%u/%u cbSector=%zu\n",
                         pImage->PCHSGeometry.cCylinders, pImage->PCHSGeometry.cHeads, pImage->PCHSGeometry.cSectors,
                         pImage->LCHSGeometry.cCylinders, pImage->LCHSGeometry.cHeads, pImage->LCHSGeometry.cSectors,
-                        pImage->cbSize / 512);
+                        pImage->cbLogicalSector);
     }
 }