Changeset 65452 in vbox

Timestamp:

Jan 26, 2017 12:45:16 PM (8 years ago)

Author:

vboxsync

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

113067

Message:

PGMAllBth.h: InvalidatePage: Skip if pgmShwGet32BitPDEPtr or pgmShwGetPaePDPTPtr returns NULL. bugref:8509

Looks like it's possible for REM to executing without triggering the MapCR3 code.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (2 diffs)

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

@@ -1233 +1233 @@
     /* Fetch the pgm pool shadow descriptor. */
     PPGMPOOLPAGE    pShwPde = pVCpu->pgm.s.CTX_SUFF(pShwPageCR3);
+#  ifdef IN_RING3 /* Possible we didn't resync yet when called from REM. */
+    if (!pShwPde)
+    {
+        STAM_COUNTER_INC(&pVCpu->pgm.s.CTX_SUFF(pStats)->CTX_MID_Z(Stat,InvalidatePageSkipped));
+        return VINF_SUCCESS;
+    }
+#  else
     Assert(pShwPde);
+#  endif
 
 # elif PGM_SHW_TYPE == PGM_TYPE_PAE
@@ -1240 +1248 @@
 
     /* If the shadow PDPE isn't present, then skip the invalidate. */
+#  ifdef IN_RING3 /* Possible we didn't resync yet when called from REM. */
+    if (!pPdptDst || !pPdptDst->a[iPdpt].n.u1Present)
+#  else
     if (!pPdptDst->a[iPdpt].n.u1Present)
-    {
-        Assert(!(pPdptDst->a[iPdpt].u & PGM_PLXFLAGS_MAPPING));
+#  endif
+    {
+        Assert(!pPdptDst || !(pPdptDst->a[iPdpt].u & PGM_PLXFLAGS_MAPPING));
         STAM_COUNTER_INC(&pVCpu->pgm.s.CTX_SUFF(pStats)->CTX_MID_Z(Stat,InvalidatePageSkipped));
         PGM_INVL_PG(pVCpu, GCPtrPage);