Changeset 30044 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Jun 4, 2010 6:59:05 PM (15 years ago)

Author:

vboxsync

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

62398

Message:

VBoxHDD/Async: Fix variable initialization, was always 0 before. Fix unallowed modification of the parent S/G buffer under certain circumstances. Both bugs happen only during a write to a so far unallocted block

File:

• trunk/src/VBox/Devices/Storage/VBoxHDD.cpp (modified) (10 diffs)

trunk/src/VBox/Devices/Storage/VBoxHDD.cpp

@@ -269 +269 @@
             /** Number of bytes to post read. */
             size_t                       cbPostRead;
+            /** Number of bytes to write left in the parent. */
+            size_t                       cbWriteParent;
             /** Write type dependent data. */
             union
@@ -281 +283 @@
                     /** Bytes to read from the image. */
                     size_t               cbReadImage;
-                    /** Number of bytes to wite left. */
-                    size_t               cbWrite;
                 } Optimized;
             } Write;
@@ -643 +643 @@
                                        PCRTSGSEG paSeg, unsigned cSeg,
                                        PVDIOCTX pIoCtxParent, size_t cbTransferParent,
-                                       void *pvAllocation,
+                                       size_t cbWriteParent, void *pvAllocation,
                                        PFNVDIOCTXTRANSFER pfnIoCtxTransfer)
 {
@@ -655 +655 @@
         pIoCtx->Type.Child.cbTransferLeftSaved = cbTransfer;
         pIoCtx->Type.Child.cbTransferParent    = cbTransferParent;
+        pIoCtx->Type.Child.cbWriteParent       = cbWriteParent;
     }
 
@@ -1299 +1300 @@
         /* Now assemble the remaining data. */
         if (cbWriteCopy)
-            vdIoCtxCopy(pIoCtx, pIoCtxParent, cbWriteCopy);
+        {
+            /*
+             * The S/G buffer of the parent needs to be cloned because
+             * it is not allowed to modify the state.
+             */
+            RTSGBUF SgBufParentTmp;
+
+            RTSgBufClone(&SgBufParentTmp, &pIoCtxParent->SgBuf);
+            RTSgBufCopy(&pIoCtx->SgBuf, &SgBufParentTmp, cbWriteCopy);
+        }
+
         /* Zero out the remainder of this block. Will never be visible, as this
          * is beyond the limit of the image. */
@@ -1313 +1324 @@
     rc = pImage->Backend->pfnAsyncWrite(pImage->pvBackendData,
                                         pIoCtx->uOffset - cbPreRead,
-                                        cbPreRead + pIoCtx->cbTransferLeft + cbPostRead,
+                                        cbPreRead + cbThisWrite + cbPostRead,
                                         pIoCtx, NULL, &cbPreRead, &cbPostRead, 0);
     Assert(rc != VERR_VD_BLOCK_FREE);
@@ -1354 +1365 @@
     size_t cbPreRead   = pIoCtx->Type.Child.cbPreRead;
     size_t cbPostRead  = pIoCtx->Type.Child.cbPostRead;
-    size_t cbWrite     = pIoCtx->Type.Child.Write.Optimized.cbWrite;
+    size_t cbWrite     = pIoCtx->Type.Child.cbWriteParent;
     size_t cbFill = 0;
     size_t cbWriteCopy = 0;
@@ -1389 +1400 @@
     pIoCtx->cbTransferLeft = cbPreRead + cbThisWrite + cbPostRead - cbFill;
     pIoCtx->cbTransfer     = pIoCtx->cbTransferLeft;
-    pIoCtx->uOffset -= cbPreRead;
+    pIoCtx->uOffset       -= cbPreRead;
 
     /* Next step */
@@ -1439 +1450 @@
                 pIoCtx->fBlocked = true;
                 Assert(pIoCtx->NodeWriteGrowing.pNext == &pDisk->ListWriteGrowing);
-                Assert(pDisk->ListWriteGrowing.pPrev == & pIoCtx->NodeWriteGrowing);
+                Assert(pDisk->ListWriteGrowing.pPrev == &pIoCtx->NodeWriteGrowing);
                 rc = VERR_VD_ASYNC_IO_IN_PROGRESS;
                 break;
@@ -1459 +1470 @@
                                                          pTmp, 1,
                                                          pIoCtx, cbThisWrite,
+                                                         cbWrite,
                                                          pTmp,
                                                            (pImage->uOpenFlags & VD_OPEN_FLAGS_HONOR_SAME)