Changeset 13871 in vbox for trunk/src/VBox/VMM

Timestamp:

Nov 5, 2008 2:45:31 PM (16 years ago)

Author:

vboxsync

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

38869

Message:

VMMR0EntryFast: Always validate idCpu.

File:

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

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

@@ -566 +566 @@
  * @param   pVM             The VM to operate on.
  *                          The return code is stored in pVM->vmm.s.iLastGZRc.
- * @param   idCPU           VMCPU id.
+ * @param   idCpu           VMCPU id.
  * @param   enmOperation    Which operation to execute.
  * @remarks Assume called with interrupts _enabled_.
  */
-VMMR0DECL(void) VMMR0EntryFast(PVM pVM, unsigned idCPU, VMMR0OPERATION enmOperation)
-{
+VMMR0DECL(void) VMMR0EntryFast(PVM pVM, unsigned idCpu, VMMR0OPERATION enmOperation)
+{
+    if (RT_UNLIKELY(idCpu >= pVM->cCPUs))
+    {
+        pVM->vmm.s.iLastGZRc = VERR_INVALID_PARAMETER;
+        return;
+    }
+
     switch (enmOperation)
     {
@@ -621 +627 @@
 
             STAM_COUNTER_INC(&pVM->vmm.s.StatRunRC);
-
-            if (idCPU >= pVM->cCPUs)
-            {
-                pVM->vmm.s.iLastGZRc = VERR_INVALID_PARAMETER;
-                return;
-            }
 
 #ifndef RT_OS_WINDOWS /** @todo check other hosts */