Changeset 66155 in vbox for trunk/src

Timestamp:

Mar 17, 2017 2:38:19 PM (8 years ago)

Author:

vboxsync

Message:

vmR3EmulationThreadWithId: Need to check both pVM and pVCpu are non-NULL before assumping we're good to use any of them. Potential SMP bootstrap race. Kudos to Alexander Boettcher for pointing it out.

File:

• trunk/src/VBox/VMM/VMMR3/VMEmt.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/VMEmt.cpp

@@ -97 +97 @@
     {
         /*
-         * During early init there is no pVM, so make a special path
+         * During early init there is no pVM and/or pVCpu, so make a special path
          * for that to keep things clearly separate.
          */
-        if (!pUVM->pVM)
+        PVM    pVM   = pUVM->pVM;
+        PVMCPU pVCpu = pUVCpu->pVCpu;
+        if (!pVCpu || !pVM)
         {
             /*
@@ -154 +156 @@
              * servicing requests. (Look after the ifs.)
              */
-            PVM    pVM   = pUVM->pVM;
-            PVMCPU pVCpu = pUVCpu->pVCpu;
             enmBefore = pVM->enmVMState;
             if (pUVM->vm.s.fTerminateEMT)