mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix: when CET was not compiled in the emulation behavior of non-CET CPU was altered

Browse Source 
CET 'change' some x86 behavior
For example EPTP[7] become not-reserved and write to it not fail anymore
VMX doesn't check error code for CP exception if CET is enabled
These behaviors these changed even when CET was not compiled in
This commit is contained in:
Shwartsman 2023-11-21 15:35:49 +02:00
parent 01a262306f
commit 591e2aa79f
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bochs/cpu/vmx.cc
View File

@ -462,14 +462,12 @@ bool BX_CPU_C::is_eptptr_valid(Bit64u eptptr)
}
// [7] CET: Enable supervisor shadow stack control
#if BX_SUPPORT_CET
if (! BX_CPUID_SUPPORT_ISA_EXTENSION(BX_ISA_CET)) {
if (eptptr & 0x80) {
if (eptptr & 0x80) {
if (! BX_CPUID_SUPPORT_ISA_EXTENSION(BX_ISA_CET)) {
BX_ERROR(("is_eptptr_valid: EPTPTR CET supervisor shadow stack control bit enabled when not supported by CPU"));
return 0;
}
}
#endif
#define BX_EPTPTR_RESERVED_BITS 0xf00 /* bits 11:8 are reserved */
if (eptptr & BX_EPTPTR_RESERVED_BITS) {
@ -973,11 +971,10 @@ VMX_error_code BX_CPU_C::VMenterLoadCheckVmControls(void)
unsigned push_error_reference = 0;
if (event_type == BX_HARDWARE_EXCEPTION && vector < BX_CPU_HANDLED_EXCEPTIONS)
push_error_reference = exceptions_info[vector].push_error;
#if BX_SUPPORT_CET
if (! BX_CPUID_SUPPORT_ISA_EXTENSION(BX_ISA_CET)) {
if (vector == BX_CP_EXCEPTION) push_error_reference = false;
}
#endif
if (vm->vmentry_interr_info & 0x7ffff000) {
BX_ERROR(("VMFAIL: VMENTRY broken interruption info field"));