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

Timestamp:

Dec 31, 2021 12:11:12 AM (3 years ago)

Author:

vboxsync

Message:

VMM/IEM: IEMExecStringIoRead must roll back memory mappings. Can happen for non-repeating instructions being forced to go to ring-3 or similar.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAll.cpp (modified) (1 diff)

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

@@ -15112 +15112 @@
     }
 
-    Assert(pVCpu->iem.s.cActiveMappings == 0 || VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_IEM));
+    if (   pVCpu->iem.s.cActiveMappings == 0
+        || VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_IEM))
+    { /* likely */ }
+    else
+    {
+        AssertMsg(!IOM_SUCCESS(rcStrict), ("%#x\n", VBOXSTRICTRC_VAL(rcStrict)));
+        iemMemRollback(pVCpu);
+    }
     return iemUninitExecAndFiddleStatusAndMaybeReenter(pVCpu, rcStrict);
 }