Changeset 33486 in vbox for trunk

Timestamp:

Oct 27, 2010 9:04:30 AM (14 years ago)

Author:

vboxsync

Message:

Additional checks

Location:

trunk/src/VBox/Devices/Storage

Files:

• ATAController.cpp (modified) (2 diffs)
• DevATA.cpp (modified) (2 diffs)

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

@@ -4706 +4706 @@
         PPDMDEVINS pDevIns = pCtl->CTX_SUFF(pDevIns);
         rc = PGMPhysSimpleDirtyWriteGCPtr(PDMDevHlpGetVMCPU(pDevIns), GCDst, s->CTX_SUFF(pbIOBuffer) + s->iIOBufferPIODataStart, cbTransfer);
+#ifndef IN_RING3
+        /* Paranoia. */
+        if (RT_FAILURE(rc))
+        {
+            PDMCritSectLeave(&pCtl->lock);
+            AssertFailed();
+            return VINF_IOM_HC_IOPORT_READ;
+        }
+#else
         Assert(rc == VINF_SUCCESS);
+#endif
 
         if (cbTransfer)
@@ -4759 +4769 @@
         rc = PGMPhysSimpleReadGCPtr(PDMDevHlpGetVMCPU(pDevIns), s->CTX_SUFF(pbIOBuffer) + s->iIOBufferPIODataStart, GCSrc, cbTransfer);
 #ifndef IN_RING3
-        /* This can fail in RC if the page table is not present for example. */
+        /* Paranoia. */
         if (RT_FAILURE(rc))
         {
             PDMCritSectLeave(&pCtl->lock);
+            AssertFailed();
             return VINF_IOM_HC_IOPORT_WRITE;
         }

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

@@ -5485 +5485 @@
 
         rc = PGMPhysSimpleDirtyWriteGCPtr(PDMDevHlpGetVMCPU(pDevIns), GCDst, s->CTX_SUFF(pbIOBuffer) + s->iIOBufferPIODataStart, cbTransfer);
+#ifndef IN_RING3
+        /* Paranoia. */
+        if (RT_FAILURE(rc))
+        {
+            PDMCritSectLeave(&pCtl->lock);
+            AssertFailed();
+            return VINF_IOM_HC_IOPORT_READ;
+        }
+#else
         Assert(rc == VINF_SUCCESS);
+#endif
 
         if (cbTransfer)
@@ -5544 +5554 @@
         rc = PGMPhysSimpleReadGCPtr(PDMDevHlpGetVMCPU(pDevIns), s->CTX_SUFF(pbIOBuffer) + s->iIOBufferPIODataStart, GCSrc, cbTransfer);
 #ifndef IN_RING3
-        /* This can fail in RC if the page table is not present for example. */
+        /* Paranoia. */
         if (RT_FAILURE(rc))
         {
             PDMCritSectLeave(&pCtl->lock);
+            AssertFailed();
             return VINF_IOM_HC_IOPORT_WRITE;
         }