Changeset 65623 in vbox

Timestamp:

Feb 6, 2017 2:02:15 PM (8 years ago)

Author:

vboxsync

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

113295

Message:

IEM: Selector checks for memory access raise #GP, not #NP. See bugref:5653:83

File:

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

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

@@ -5266 +5266 @@
 {
     return iemRaiseXcptOrInt(pVCpu, 0, X86_XCPT_NP, IEM_XCPT_FLAGS_T_CPU_XCPT | IEM_XCPT_FLAGS_ERR, uErr, 0);
-}
-
-
-/** \#NP(seg) - 0b.  */
-DECL_NO_INLINE(IEM_STATIC, VBOXSTRICTRC) iemRaiseSelectorNotPresentBySegReg(PVMCPU pVCpu, uint32_t iSegReg)
-{
-    return iemRaiseXcptOrInt(pVCpu, 0, X86_XCPT_NP, IEM_XCPT_FLAGS_T_CPU_XCPT | IEM_XCPT_FLAGS_ERR,
-                             iemSRegFetchU16(pVCpu, iSegReg) & ~X86_SEL_RPL, 0);
 }
 
@@ -7433 +7425 @@
         if (!pHid->Attr.n.u1Present)
         {
-            Log(("iemMemSegCheckWriteAccessEx: %#x (index %u) - segment not present -> #NP\n", iemSRegFetchU16(pVCpu, iSegReg), iSegReg));
-            return iemRaiseSelectorNotPresentBySegReg(pVCpu, iSegReg);
+            uint16_t    uSel = iemSRegFetchU16(pVCpu, iSegReg);
+            AssertRelease(uSel == 0);
+            Log(("iemMemSegCheckWriteAccessEx: %#x (index %u) - bad selector -> #GP\n", uSel, iSegReg));
+            return iemRaiseGeneralProtectionFault0(pVCpu);
         }
 
@@ -7469 +7463 @@
         if (!pHid->Attr.n.u1Present)
         {
-            Log(("iemMemSegCheckReadAccessEx: %#x (index %u) - segment not present -> #NP\n", iemSRegFetchU16(pVCpu, iSegReg), iSegReg));
-            return iemRaiseSelectorNotPresentBySegReg(pVCpu, iSegReg);
+            uint16_t    uSel = iemSRegFetchU16(pVCpu, iSegReg);
+            AssertRelease(uSel == 0);
+            Log(("iemMemSegCheckReadAccessEx: %#x (index %u) - bad selector -> #GP\n", uSel, iSegReg));
+            return iemRaiseGeneralProtectionFault0(pVCpu);
         }