Changeset 30066 in vbox

Timestamp:

Jun 7, 2010 12:37:52 PM (15 years ago)

Author:

vboxsync

Message:

PGMAllPhyc.cpp: Must grab the pgm lock before accessing the page array in PGMPhysGCPhys2CCPtr and PGMPhysGCPhys2CCPtrReadOnly, esp. in the former as it may have to make the page writable.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp

@@ -1245 +1245 @@
 VMMDECL(int) PGMPhysGCPhys2CCPtr(PVM pVM, RTGCPHYS GCPhys, void **ppv, PPGMPAGEMAPLOCK pLock)
 {
+    int rc = pgmLock(pVM);
+    AssertRCReturn(rc, rc);
+
 #if defined(IN_RC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
-
     /*
      * Find the page and make sure it's writable.
      */
     PPGMPAGE pPage;
-    int rc = pgmPhysGetPageEx(&pVM->pgm.s, GCPhys, &pPage);
+    rc = pgmPhysGetPageEx(&pVM->pgm.s, GCPhys, &pPage);
     if (RT_SUCCESS(rc))
     {
@@ -1271 +1273 @@
 
 #else  /* IN_RING3 || IN_RING0 */
-    int rc = pgmLock(pVM);
-    AssertRCReturn(rc, rc);
-
     /*
      * Query the Physical TLB entry for the page (may fail).
@@ -1325 +1324 @@
     }
 
+#endif /* IN_RING3 || IN_RING0 */
     pgmUnlock(pVM);
-#endif /* IN_RING3 || IN_RING0 */
     return rc;
 }
@@ -1357 +1356 @@
 VMMDECL(int) PGMPhysGCPhys2CCPtrReadOnly(PVM pVM, RTGCPHYS GCPhys, void const **ppv, PPGMPAGEMAPLOCK pLock)
 {
+    int rc = pgmLock(pVM);
+    AssertRCReturn(rc, rc);
+
 #if defined(IN_RC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
-
     /*
      * Find the page and make sure it's readable.
      */
     PPGMPAGE pPage;
-    int rc = pgmPhysGetPageEx(&pVM->pgm.s, GCPhys, &pPage);
+    rc = pgmPhysGetPageEx(&pVM->pgm.s, GCPhys, &pPage);
     if (RT_SUCCESS(rc))
     {
@@ -1383 +1384 @@
 
 #else  /* IN_RING3 || IN_RING0 */
-    int rc = pgmLock(pVM);
-    AssertRCReturn(rc, rc);
-
     /*
      * Query the Physical TLB entry for the page (may fail).
@@ -1427 +1425 @@
     }
 
+#endif /* IN_RING3 || IN_RING0 */
     pgmUnlock(pVM);
-#endif /* IN_RING3 || IN_RING0 */
     return rc;
 }