Changeset 51334 in vbox for trunk/src

Timestamp:

May 22, 2014 6:06:18 AM (11 years ago)

Author:

vboxsync

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

93818

Message:

VMM/CPUM: Fix NULL ptr deref. due to premature access.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• CPUMR3CpuId.cpp (modified) (2 diffs)
• CPUMR3Db.cpp (modified) (2 diffs)

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

@@ -679 +679 @@
 int cpumR3CpuIdInsert(PVM pVM, PCPUMCPUIDLEAF *ppaLeaves, uint32_t *pcLeaves, PCPUMCPUIDLEAF pNewLeaf)
 {
-    PCPUMCPUIDLEAF  paLeaves = *ppaLeaves;
-    uint32_t        cLeaves  = *pcLeaves;
-
     /*
      * Validate input parameters if we are using the hyper heap and use the VM's CPUID arrays.
@@ -693 +690 @@
         pcLeaves  = &pVM->cpum.s.GuestInfo.cCpuIdLeaves;
     }
+
+    PCPUMCPUIDLEAF  paLeaves = *ppaLeaves;
+    uint32_t        cLeaves  = *pcLeaves;
 
     /*

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

@@ -369 +369 @@
 int cpumR3MsrRangesInsert(PVM pVM, PCPUMMSRRANGE *ppaMsrRanges, uint32_t *pcMsrRanges, PCCPUMMSRRANGE pNewRange)
 {
-    uint32_t        cMsrRanges  = *pcMsrRanges;
-    PCPUMMSRRANGE   paMsrRanges = *ppaMsrRanges;
-
     Assert(pNewRange->uLast >= pNewRange->uFirst);
     Assert(pNewRange->enmRdFn > kCpumMsrRdFn_Invalid && pNewRange->enmRdFn < kCpumMsrRdFn_End);
@@ -387 +384 @@
         pcMsrRanges  = &pVM->cpum.s.GuestInfo.cMsrRanges;
     }
+
+    uint32_t        cMsrRanges  = *pcMsrRanges;
+    PCPUMMSRRANGE   paMsrRanges = *ppaMsrRanges;
 
     /*