Changeset 33485 in vbox for trunk/src

Timestamp:

Oct 27, 2010 8:59:48 AM (14 years ago)

Author:

vboxsync

Message:

ATA: Don't assume that PGMPhysSimpleReadGCPtr succeeds in RC/R0 but go back to R3 if it fails.

Location:

trunk/src/VBox/Devices/Storage

Files:

• ATAController.cpp (modified) (1 diff)
• DevATA.cpp (modified) (1 diff)

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

@@ -4758 +4758 @@
         PPDMDEVINS pDevIns = pCtl->CTX_SUFF(pDevIns);
         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. */
+        if (RT_FAILURE(rc))
+        {
+            PDMCritSectLeave(&pCtl->lock);
+            return VINF_IOM_HC_IOPORT_WRITE;
+        }
+#else
         Assert(rc == VINF_SUCCESS);
+#endif
 
         if (cbTransfer)

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

@@ -5543 +5543 @@
 
         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. */
+        if (RT_FAILURE(rc))
+        {
+            PDMCritSectLeave(&pCtl->lock);
+            return VINF_IOM_HC_IOPORT_WRITE;
+        }
+#else
         Assert(rc == VINF_SUCCESS);
+#endif
 
         if (cbTransfer)