Changeset 14499 in vbox

Timestamp:

Nov 24, 2008 1:48:34 AM (16 years ago)

Author:

vboxsync

Message:

VMM: Don't try use the invalid pvSavedStack pointer on darwin, set it to NULL instead. (assertions on EMT would cause corruption or crash)

Location:

trunk/src/VBox/VMM

Files:

• VMM.cpp (modified) (1 diff)
• VMMR0/VMMR0.cpp (modified) (1 diff)
• VMMR0/VMMR0A.asm (modified) (2 diffs)

trunk/src/VBox/VMM/VMM.cpp

@@ -230 +230 @@
     if (RT_SUCCESS(rc))
     {
-        pVM->vmm.s.CallHostR0JmpBuf.pvSavedStack = MMHyperR3ToR0(pVM, pVM->vmm.s.pbEMTStackR3);
+#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
+        /* MMHyperR3ToR0 returns R3 when not doing hardware assisted virtualization. */
+        if (!HWACCMIsEnabled(pVM))
+            pVM->vmm.s.CallHostR0JmpBuf.pvSavedStack = NIL_RTR0PTR;
+        else
+#endif
+            pVM->vmm.s.CallHostR0JmpBuf.pvSavedStack = MMHyperR3ToR0(pVM, pVM->vmm.s.pbEMTStackR3);
         pVM->vmm.s.pbEMTStackRC = MMHyperR3ToRC(pVM, pVM->vmm.s.pbEMTStackR3);
         pVM->vmm.s.pbEMTStackBottomRC = pVM->vmm.s.pbEMTStackRC + VMM_STACK_SIZE;

trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

@@ -55 +55 @@
 *   Internal Functions                                                         *
 *******************************************************************************/
-static int VMMR0Init(PVM pVM, uint32_t uSvnRev);
-static int VMMR0Term(PVM pVM);
 __BEGIN_DECLS
 VMMR0DECL(int) ModuleInit(void);

trunk/src/VBox/VMM/VMMR0/VMMR0A.asm

@@ -305 +305 @@
     ;
     mov     edi, [edx + VMMR0JMPBUF.pvSavedStack]
+    cmp     edi, 0                      ; darwin may set this to 0.
+    je      .nok
     mov     [edx + VMMR0JMPBUF.SpResume], esp
     mov     esi, esp
@@ -383 +385 @@
     ;
     mov     rdi, [rdx + VMMR0JMPBUF.pvSavedStack]
+    cmp     rdi, 0                      ; darwin may set this to 0.
+    je      .nok
     mov     [rdx + VMMR0JMPBUF.SpResume], rsp
     mov     rsi, rsp