Skip to content

Commit b403d39

Browse files
committed
8267213: cpuinfo_segv is incorrectly triaged as execution protection violation on x86_32
Reviewed-by: dholmes
1 parent 66b190e commit b403d39

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -551,6 +551,7 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
551551
// the si_code for this condition may change in the future.
552552
// Furthermore, a false-positive should be harmless.
553553
if (UnguardOnExecutionViolation > 0 &&
554+
stub == NULL &&
554555
(sig == SIGSEGV || sig == SIGBUS) &&
555556
uc->context_trapno == trap_page_fault) {
556557
int page_size = os::vm_page_size();

src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,7 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
343343
// the si_code for this condition may change in the future.
344344
// Furthermore, a false-positive should be harmless.
345345
if (UnguardOnExecutionViolation > 0 &&
346+
stub == NULL &&
346347
(sig == SIGSEGV || sig == SIGBUS) &&
347348
uc->uc_mcontext.gregs[REG_TRAPNO] == trap_page_fault) {
348349
int page_size = os::vm_page_size();

0 commit comments

Comments
 (0)