infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-16 05:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

8288023: AArch64: disable PAC-RET when preview is enabled

Browse Source 
Reviewed-by: rpressler, adinn
This commit is contained in:
Nick Gasson 2022-06-09 11:48:46 +00:00
parent 560e2927e3
commit 4285e3d6db
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
View File

@ -425,9 +425,10 @@ void VM_Version::initialize() {
_rop_protection = false;
} else if (strcmp(UseBranchProtection, "standard") == 0) {
_rop_protection = false;
// Enable PAC if this code has been built with branch-protection and the CPU/OS supports it.
// Enable PAC if this code has been built with branch-protection, the CPU/OS
// supports it, and incompatible preview features aren't enabled.
#ifdef __ARM_FEATURE_PAC_DEFAULT
if (VM_Version::supports_paca()) {
if (VM_Version::supports_paca() && !Arguments::enable_preview()) {
_rop_protection = true;
}
#endif
@ -438,6 +439,10 @@ void VM_Version::initialize() {
warning("ROP-protection specified, but not supported on this CPU.");
// Disable PAC to prevent illegal instruction crashes.
_rop_protection = false;
} else if (Arguments::enable_preview()) {
// Not currently compatible with continuation freeze/thaw.
warning("PAC-RET is incompatible with virtual threads preview feature.");
_rop_protection = false;
}
#else
warning("ROP-protection specified, but this VM was built without ROP-protection support.");