From 4eb8d0c835b721a63829990ecffe1cda63da5582 Mon Sep 17 00:00:00 2001 From: Exverge Date: Fri, 17 Jul 2026 19:42:56 -0400 Subject: [PATCH] Revert "[nce] disable control flow guard on win32" This reverts commit 963bf8ae084ce6fd3e59aaa5a3763f70f56d3c19. --- src/core/arm/nce/arm_nce.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/core/arm/nce/arm_nce.cpp b/src/core/arm/nce/arm_nce.cpp index a2a47bf003..66213a7d16 100644 --- a/src/core/arm/nce/arm_nce.cpp +++ b/src/core/arm/nce/arm_nce.cpp @@ -625,15 +625,7 @@ void ArmNce::Initialize() { }); #else static std::once_flag flag; - std::call_once(flag, [] { - // Initialize exception handler - AddVectoredExceptionHandler(1, VectoredExceptionHandler); - - // Disable control flow guard to allow context switching to guest code without causing a security error - PROCESS_MITIGATION_CONTROL_FLOW_GUARD_POLICY cfg_policy{}; - cfg_policy.EnableControlFlowGuard = 0; - SetProcessMitigationPolicy(ProcessControlFlowGuardPolicy, &cfg_policy, sizeof(cfg_policy)); - }); + std::call_once(flag, [] { AddVectoredExceptionHandler(1, VectoredExceptionHandler); }); #endif }