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

Timestamp:

Nov 9, 2022 12:52:54 AM (2 years ago)

Author:

vboxsync

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

154483

Message:

VMM/IEM: Fixed two indirect longjmp/throw calls in the TLB version of iemMemMap. bugref:9898

File:

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

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

@@ -6073 +6073 @@
                 IEM_VMX_VMEXIT_EPT_RET(pVCpu, &Walk, fAccess, IEM_SLAT_FAIL_LINEAR_TO_PHYS_ADDR, 0 /* cbInstr */);
 # endif
-            iemRaisePageFaultJmp(pVCpu, GCPtrMem, fAccess, rc);
+            return iemRaisePageFault(pVCpu, GCPtrMem, fAccess, rc);
         }
 
@@ -6102 +6102 @@
                 IEM_VMX_VMEXIT_EPT_RET(pVCpu, &Walk, fAccess, IEM_SLAT_FAIL_LINEAR_TO_PAGE_TABLE, 0 /* cbInstr */);
 # endif
-            iemRaisePageFaultJmp(pVCpu, GCPtrMem, fAccess & ~IEM_ACCESS_TYPE_READ, VERR_ACCESS_DENIED);
+            return iemRaisePageFault(pVCpu, GCPtrMem, fAccess & ~IEM_ACCESS_TYPE_READ, VERR_ACCESS_DENIED);
         }
 
@@ -6115 +6115 @@
                 IEM_VMX_VMEXIT_EPT_RET(pVCpu, &Walk, fAccess, IEM_SLAT_FAIL_LINEAR_TO_PAGE_TABLE, 0 /* cbInstr */);
 # endif
-            iemRaisePageFaultJmp(pVCpu, GCPtrMem, fAccess, VERR_ACCESS_DENIED);
+            return iemRaisePageFault(pVCpu, GCPtrMem, fAccess, VERR_ACCESS_DENIED);
         }
     }