WIP: Check Control Flow Guard on Windows #21154
Draft
+26
−0
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
a7ehuo
requested review from
keithc-ca and
0xdaryl
and removed request for
dsouzai
If Control Flow Guard (CFG) is enabled in Windows, set TR_NoResumableTrapHandler in the JIT. This change relies on API GetProcessMitigationPolicy. Its minimum supported client version is Windows 8 and its minimum supported server version is Windows Server 2012. Fixes: eclipse-openj9#19892 Signed-off-by: Annabelle Huo <[email protected]>
a7ehuo
force-pushed
the
windows-cfg-detection-4
branch
from
703ed2d to
e547739
Compare
|
@0xdaryl @keithc-ca May I ask you to review this change? Thank you! @JamesKingdon fyi |
|
The JIT change is ok with me. |
keithc-ca
requested changes
Feb 20, 2025
Comment on lines
+3283
to
+3284
| // If Control Flow Guard (CFG) is enabled in Windows, set TR_NoResumableTrapHandler | ||
| if (J9_ARE_ALL_BITS_SET(javaVM->sigFlags, J9_SIG_WINDOWS_MITIGATION_POLICY_CFG_ENABLED)) |
There was a problem hiding this comment.
Please finish each sentence with a period.
This should use _ANY_ instead of _ALL_ (it's testing a single bit):
// If Control Flow Guard (CFG) is enabled in Windows, set TR_NoResumableTrapHandler.
if (J9_ARE_ANY_BITS_SET(javaVM->sigFlags, J9_SIG_WINDOWS_MITIGATION_POLICY_CFG_ENABLED))While you're here, please correct the typo on line 3289 (jitt -> jit).
Comment on lines
+8100
to
+8101
| #if defined(WIN32) | ||
| #if defined(_WIN32_WINNT_WINBLUE) && (_WIN32_WINNT_MAXVER >= _WIN32_WINNT_WINBLUE) |
There was a problem hiding this comment.
Suggest merging these:
#if defined(WIN32) && defined(_WIN32_WINNT_WINBLUE) && (_WIN32_WINNT_MAXVER >= _WIN32_WINNT_WINBLUE)
then updating the #endif comment
#endif /* defined(WIN32) && defined(_WIN32_WINNT_WINBLUE) && (_WIN32_WINNT_MAXVER >= _WIN32_WINNT_WINBLUE) */| HMODULE h_kernel32 = GetModuleHandle(TEXT("kernel32.dll")); | ||
|
|
||
| if (h_kernel32 && IsWindows8OrGreater()) { | ||
| void *getProcessMitigationPolicyFunc = (void*)GetProcAddress(h_kernel32, "GetProcessMitigationPolicy"); |
There was a problem hiding this comment.
Suggest introducing a typdef, so fewer casts are needed:
typedef (BOOL (WINAPI * PMP_func)(HANDLE, PROCESS_MITIGATION_POLICY, PVOID, SIZE_T);
PMP_func getProcessMitigationPolicyFunc = (PMP_func)GetProcAddress(h_kernel32, "GetProcessMitigationPolicy");Please make null checks explicit and split the condition according to our coding standard:
if (((PMP_func)NULL != getProcessMitigationPolicyFunc)
&& getProcessMitigationPolicyFunc(
GetCurrentProcess(),
ProcessControlFlowGuardPolicy,
&cfgPolicy,
sizeof(cfgPolicy))
&& cfgPolicy.EnableControlFlowGuard
) {
a7ehuo
changed the title
|
Change status to |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If Control Flow Guard (CFG) is enabled in Windows, set
TR_NoResumableTrapHandlerin the JIT.This change relies on API
GetProcessMitigationPolicy. Its minimum supported client version is Windows 8 and its minimum supported server version is Windows Server 2012.Fixes: #19892