Changeset 80510 in vbox

Timestamp:

Aug 30, 2019 9:56:16 AM (5 years ago)

Author:

vboxsync

Message:

VMM/IEM: Added an assertion in IEMExecLots that the TRPM event being checked is indeed an interrupt (since we also check if interrupts are enabled before injecting them). Otherwise, we risk not delivering an exception (that is in TRPM) if interrupts are disabled and can lead to invalid execution sequence.

File:

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

trunk/src/VBox/VMM/VMMAll/IEMAll.cpp

@@ -14271 +14271 @@
 
     /** @todo What if we are injecting an exception and not an interrupt? Is that
-     *        possible here? */
+     *        possible here? For now we assert it is indeed only an interrupt. */
     if (   fIntrEnabled
         && TRPMHasTrap(pVCpu)
@@ -14281 +14281 @@
         RTGCPTR     uCr2;
         int rc2 = TRPMQueryTrapAll(pVCpu, &u8TrapNo, &enmType, &uErrCode, &uCr2, NULL /* pu8InstLen */); AssertRC(rc2);
+        Assert(enmType == TRPM_HARDWARE_INT);
         VBOXSTRICTRC rcStrict = IEMInjectTrap(pVCpu, u8TrapNo, enmType, (uint16_t)uErrCode, uCr2, 0 /* cbInstr */);
         TRPMResetTrap(pVCpu);