Changeset 77896 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Mar 27, 2019 4:51:37 AM (6 years ago)

Author:

vboxsync

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

129602

Message:

VMM/IEM: Fix CPL checks for INT1 (ICEBP) generated #DBs. Fix v8086 mode IOPL checks for INT1 (ICEBP) and INTO.

File:

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

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

@@ -4869 +4869 @@
 
     /* Check DPL against CPL if applicable. */
-    if (fFlags & IEM_XCPT_FLAGS_T_SOFT_INT)
+    if (fFlags & (IEM_XCPT_FLAGS_T_SOFT_INT | IEM_XCPT_FLAGS_ICEBP_INSTR) == IEM_XCPT_FLAGS_T_SOFT_INT)
     {
         if (pVCpu->iem.s.uCpl > Idte.Gate.u2Dpl)
@@ -5304 +5304 @@
 
     /* Check DPL against CPL if applicable. */
-    if (fFlags & IEM_XCPT_FLAGS_T_SOFT_INT)
+    if (fFlags & (IEM_XCPT_FLAGS_T_SOFT_INT | IEM_XCPT_FLAGS_ICEBP_INSTR) == IEM_XCPT_FLAGS_T_SOFT_INT)
     {
         if (pVCpu->iem.s.uCpl > Idte.Gate.u2Dpl)
@@ -5525 +5525 @@
     if (   pVCpu->cpum.GstCtx.eflags.Bits.u1VM
         && pVCpu->cpum.GstCtx.eflags.Bits.u2IOPL != 3
-        && (fFlags & (IEM_XCPT_FLAGS_T_SOFT_INT | IEM_XCPT_FLAGS_BP_INSTR)) == IEM_XCPT_FLAGS_T_SOFT_INT
+        && (fFlags & (  IEM_XCPT_FLAGS_T_SOFT_INT
+                      | IEM_XCPT_FLAGS_BP_INSTR
+                      | IEM_XCPT_FLAGS_ICEBP_INSTR
+                      | IEM_XCPT_FLAGS_OF_INSTR)) == IEM_XCPT_FLAGS_T_SOFT_INT
         && (pVCpu->cpum.GstCtx.cr0 & X86_CR0_PE) )
     {