Changeset 39413 in vbox

Timestamp:

Nov 24, 2011 9:51:03 PM (13 years ago)

Author:

vboxsync

Message:

VD: Fix reading wrong data under certain circumstances when using differential images and VMDK, VHD, QED or QCOW images + a fix for a possible lock order violation when a flush request completes

File:

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

trunk/src/VBox/Storage/VD.cpp

@@ -1782 +1782 @@
     size_t cbToRead     = pIoCtx->Req.Io.cbTransfer;
     uint64_t uOffset    = pIoCtx->Req.Io.uOffset;
-    PVDIMAGE pCurrImage = NULL;
+    PVDIMAGE pCurrImage = pIoCtx->Req.Io.pImageCur;;
     size_t cbThisRead;
 
@@ -1788 +1788 @@
     do
     {
-        pCurrImage = pIoCtx->Req.Io.pImageCur;
-
         /* Search for image with allocated block. Do not attempt to read more
          * than the previous reads marked as valid. Otherwise this would return
@@ -1837 +1835 @@
         cbToRead -= cbThisRead;
         uOffset  += cbThisRead;
+        pCurrImage = pIoCtx->Req.Io.pImageStart; /* Start with the highest image in the chain. */
     } while (cbToRead != 0 && RT_SUCCESS(rc));
 
@@ -3651 +3650 @@
             else
             {
+                RTCritSectLeave(&pDisk->CritSect);
+
                 if (pIoCtx->enmTxDir == VDIOCTXTXDIR_FLUSH)
                 {
@@ -3666 +3667 @@
 
                 LogFlowFunc(("I/O context completed pIoCtx=%#p rcReq=%Rrc\n", pIoCtx, pIoCtx->rcReq));
-                RTCritSectLeave(&pDisk->CritSect);
                 pIoCtx->Type.Root.pfnComplete(pIoCtx->Type.Root.pvUser1,
                                               pIoCtx->Type.Root.pvUser2,