Changeset 50526 in vbox

Timestamp:

Feb 20, 2014 5:01:32 PM (11 years ago)

Author:

vboxsync

Message:

Storage/VHDX: Finally commit and enable CRC-32c checksum validation after finding the cause for the failing checksum computation. The whole 4KB space needs to get used for the checksum though the header is only 512 bytes

Location:

trunk

Files:

• include/iprt/crc.h (modified) (1 diff)
• include/iprt/mangling.h (modified) (1 diff)
• src/VBox/Runtime/Makefile.kmk (modified) (1 diff)
• src/VBox/Runtime/common/checksum/crc32c.cpp (added)
• src/VBox/Storage/VHDX.cpp (modified) (4 diffs)

trunk/include/iprt/crc.h

@@ -153 +153 @@
 /** @} */
 
+
+/** @defgroup grp_rt_crc32c  CRC-32C
+ * @{ */
+/**
+ * Calculate CRC-32C for a memory block.
+ *
+ * @returns CRC-32C for the memory block.
+ * @param   pv      Pointer to the memory block.
+ * @param   cb      Size of the memory block in bytes.
+ */
+RTDECL(uint32_t)    RTCrc32C(const void *pv, size_t cb);
+
+/**
+ * Start a multiblock CRC-32 calculation.
+ *
+ * @returns Start CRC-32.
+ */
+RTDECL(uint32_t)    RTCrc32CStart(void);
+
+/**
+ * Processes a multiblock of a CRC-32C calculation.
+ *
+ * @returns Intermediate CRC-32C value.
+ * @param   uCRC32C Current CRC-32C intermediate value.
+ * @param   pv      The data block to process.
+ * @param   cb      The size of the data block in bytes.
+ */
+RTDECL(uint32_t)    RTCrc32CProcess(uint32_t uCRC32C, const void *pv, size_t cb);
+
+/**
+ * Complete a multiblock CRC-32 calculation.
+ *
+ * @returns CRC-32 value.
+ * @param   uCRC32  Current CRC-32 intermediate value.
+ */
+RTDECL(uint32_t)    RTCrc32CFinish(uint32_t uCRC32);
+
+/** @} */
+
 /** @} */
 

trunk/include/iprt/mangling.h

@@ -319 +319 @@
 # define RTCrc32Process                                 RT_MANGLER(RTCrc32Process)
 # define RTCrc32Start                                   RT_MANGLER(RTCrc32Start)
+# define RTCrc32C                                       RT_MANGLER(RTCrc32C)
+# define RTCrc32CFinish                                 RT_MANGLER(RTCrc32CFinish)
+# define RTCrc32CProcess                                RT_MANGLER(RTCrc32CProcess)
+# define RTCrc32CStart                                  RT_MANGLER(RTCrc32CStart)
 # define RTCrc64                                        RT_MANGLER(RTCrc64)
 # define RTCrc64Finish                                  RT_MANGLER(RTCrc64Finish)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -264 +264 @@
         common/checksum/adler32.cpp \
         common/checksum/crc32.cpp \
+        common/checksum/crc32c.cpp \
         common/checksum/crc64.cpp \
         common/checksum/md5.cpp \

trunk/src/VBox/Storage/VHDX.cpp

@@ -1064 +1064 @@
             u32ChkSumSaved = pHdr1->u32Checksum;
             pHdr1->u32Checksum = 0;
-            //u32ChkSum = RTCrc32C(pHdr1, RT_OFFSETOF(VhdxHeader, u8Reserved[502]));
+            u32ChkSum = RTCrc32C(pHdr1, sizeof(VhdxHeader));
 
             if (   pHdr1->u32Signature == VHDX_HEADER_SIGNATURE
-                /*&& u32ChkSum == u32ChkSumSaved*/)
+                && u32ChkSum == u32ChkSumSaved)
                 fHdr1Valid = true;
         }
@@ -1081 +1081 @@
             u32ChkSumSaved = pHdr2->u32Checksum;
             pHdr2->u32Checksum = 0;
-            //u32ChkSum = RTCrc32C(pHdr2, RT_OFFSETOF(VhdxHeader, u8Reserved[502]));
+            u32ChkSum = RTCrc32C(pHdr2, sizeof(VhdxHeader));
 
             if (   pHdr2->u32Signature == VHDX_HEADER_SIGNATURE
-                /*&& u32ChkSum == u32ChkSumSaved*/)
+                && u32ChkSum == u32ChkSumSaved)
                 fHdr2Valid = true;
         }
@@ -1571 +1571 @@
 
             /* Verify the region table integrity. */
-            //u32ChkSum = RTCrc32C(pbRegionTbl, VHDX_REGION_TBL_SIZE_MAX);
+            u32ChkSum = RTCrc32C(pbRegionTbl, VHDX_REGION_TBL_SIZE_MAX);
 
             if (RegionTblHdr.u32Signature != VHDX_REGION_TBL_HDR_SIGNATURE)
@@ -1577 +1577 @@
                                "VHDX: Invalid signature for region table header of image \'%s\'",
                                pImage->pszFilename);
-#if 0
             else if (u32ChkSum != RegionTblHdr.u32Checksum)
                 rc = vdIfError(pImage->pIfError, VERR_VD_GEN_INVALID_HEADER, RT_SRC_POS,
                                "VHDX: CRC32 checksum mismatch for the region table of image \'%s\' (expected %#x got %#x)",
                                pImage->pszFilename, RegionTblHdr.u32Checksum, u32ChkSum);
-#endif
             else if (RegionTblHdr.u32EntryCount > VHDX_REGION_TBL_HDR_ENTRY_COUNT_MAX)
                 rc = vdIfError(pImage->pIfError, VERR_VD_GEN_INVALID_HEADER, RT_SRC_POS,