Future/hypervisor
1
0
Fork 0
mirror of https://github.com/momo5502/hypervisor.git synced 2025-04-20 05:55:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix stack corruption during hypervisor launch

Browse Source
This commit is contained in:
momo5502 2022-04-23 12:57:59 +02:00
parent 42ec6413c9
commit ea6f18ea5e
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/driver/hypervisor.cpp
View File

@ -60,12 +60,10 @@ namespace
_sldt(&special_registers.ldtr); _sldt(&special_registers.ldtr);
} }
void capture_cpu_context(vmx::launch_context& launch_context) // This absolutely needs to be inlined. Otherwise the stack might be broken upon restoration
{ #define capture_cpu_context(launch_context) \
cpature_special_registers(launch_context.special_registers); cpature_special_registers((launch_context).special_registers);\
RtlCaptureContext(&launch_context.context_frame); RtlCaptureContext(&(launch_context).context_frame);
}
void restore_descriptor_tables(vmx::launch_context& launch_context) void restore_descriptor_tables(vmx::launch_context& launch_context)
{ {
@ -107,6 +105,7 @@ namespace
auto* vm_state = resolve_vm_state_from_context(*context); auto* vm_state = resolve_vm_state_from_context(*context);
vm_state->launch_context.context_frame.EFlags |= EFLAGS_ALIGNMENT_CHECK_FLAG_FLAG; vm_state->launch_context.context_frame.EFlags |= EFLAGS_ALIGNMENT_CHECK_FLAG_FLAG;
vm_state->launch_context.launched = true;
restore_context(&vm_state->launch_context.context_frame); restore_context(&vm_state->launch_context.context_frame);
} }
} }
@ -670,12 +669,18 @@ void hypervisor::enable_core(const uint64_t system_directory_table_base)
debug_log("Enabling hypervisor on core %d\n", thread::get_processor_index()); debug_log("Enabling hypervisor on core %d\n", thread::get_processor_index());
auto* vm_state = this->get_current_vm_state(); auto* vm_state = this->get_current_vm_state();
if (!is_virtualization_supported())
{
throw std::runtime_error("VMX not supported on this core");
}
vm_state->launch_context.launched = false;
vm_state->launch_context.system_directory_table_base = system_directory_table_base; vm_state->launch_context.system_directory_table_base = system_directory_table_base;
// Must be inlined here, otherwise the stack is broken
capture_cpu_context(vm_state->launch_context); capture_cpu_context(vm_state->launch_context);
const rflags rflags{.flags = __readeflags()}; if (!vm_state->launch_context.launched)
if (!rflags.alignment_check_flag)
{ {
launch_hypervisor(*vm_state); launch_hypervisor(*vm_state);
} }

1
src/driver/vmx.hpp
View File

@ -37,6 +37,7 @@ namespace vmx
uint64_t vmcs_physical_address; uint64_t vmcs_physical_address;
uint64_t msr_bitmap_physical_address; uint64_t msr_bitmap_physical_address;
ia32_vmx_procbased_ctls2_register ept_controls; ia32_vmx_procbased_ctls2_register ept_controls;
bool launched;
}; };
struct state struct state