Changeset 19195 in vbox for trunk

Timestamp:

Apr 27, 2009 8:53:12 AM (16 years ago)

Author:

vboxsync

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

46529

Message:

Fixed possible corruption due to RC cache entry reuse.

Location:

trunk/src/VBox/VMM

Files:

• PGMInternal.h (modified) (1 diff)
• VMMAll/PGMAllBth.h (modified) (2 diffs)

trunk/src/VBox/VMM/PGMInternal.h

@@ -2449 +2449 @@
 
     /* RC only: */
-    STAMCOUNTER StatRCDynMapCacheMisses;            /**< RC: The number of dynamic page mapping cache hits */
-    STAMCOUNTER StatRCDynMapCacheHits;              /**< RC: The number of dynamic page mapping cache misses */
+    STAMCOUNTER StatRCDynMapCacheMisses;            /**< RC: The number of dynamic page mapping cache misses */
+    STAMCOUNTER StatRCDynMapCacheHits;              /**< RC: The number of dynamic page mapping cache hits */
     STAMCOUNTER StatRCInvlPgConflict;               /**< RC: Number of times PGMInvalidatePage() detected a mapping conflict. */
     STAMCOUNTER StatRCInvlPgSyncMonCR3;             /**< RC: Number of times PGMInvalidatePage() ran into PGM_SYNC_MONITOR_CR3. */

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

@@ -3152 +3152 @@
 # endif
 
+# if defined(IN_RC)
+    /* Make sure the dynamic pPdeDst mapping will not be reused during this function. */
+    PGMDynLockHCPage(pVM, (uint8_t *)pPdeDst);
+# endif
+
     if (!pPdeDst->n.u1Present)
     {
-# if defined(IN_RC)
-        /* Make sure the dynamic pPdeDst mapping will not be reused during this function. */
-        PGMDynLockHCPage(pVM, (uint8_t *)pPdeDst);
-# endif
         rc = PGM_BTH_NAME(SyncPT)(pVCpu, iPDSrc, pPDSrc, GCPtrPage);
-# if defined(IN_RC)
-        /* Make sure the dynamic pPdeDst mapping will not be reused during this function. */
-        PGMDynUnlockHCPage(pVM, (uint8_t *)pPdeDst);
-# endif
         AssertRC(rc);
         if (rc != VINF_SUCCESS)
+        {
+# if defined(IN_RC)
+            /* Make sure the dynamic pPdeDst mapping will not be reused during this function. */
+            PGMDynUnlockHCPage(pVM, (uint8_t *)pPdeDst);
+# endif
             return rc;
+        }
     }
 
@@ -3202 +3205 @@
         {
             Log(("PGMVerifyAccess: access violation for %RGv rc=%d\n", GCPtrPage, rc));
-            return VINF_EM_RAW_GUEST_TRAP;
+            rc = VINF_EM_RAW_GUEST_TRAP;
         }
     }
+# if defined(IN_RC)
+    /* Make sure the dynamic pPdeDst mapping will not be reused during this function. */
+    PGMDynUnlockHCPage(pVM, (uint8_t *)pPdeDst);
+# endif
     return rc;