openbsd/src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2026-04-22 13:14:35 +00:00
Code Issues Projects Releases Wiki Activity

Treat "Instruction access fault" (EXCP_FAULT_FETCH) traps as PROT_EXEC.

Browse Source 
Fixes random SIGSEGV on the SpecemiT X60 cores.

ok mlarkin@, deraadt@
This commit is contained in:
kettenis
2026-04-05 22:13:21 +00:00
parent d1a03e1b55
commit 8a4a3a78bb
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sys/arch/riscv64/riscv64/trap.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: trap.c,v 1.21 2026/03/08 17:07:31 deraadt Exp $ */
/* $OpenBSD: trap.c,v 1.22 2026/04/05 22:13:21 kettenis Exp $ */
/*
* Copyright (c) 2020 Shivam Waghela <shivamwaghela@gmail.com>
@@ -176,10 +176,11 @@ accesstype(struct trapframe *frame)
{
vm_prot_t access_type;
if ((frame->tf_scause == EXCP_FAULT_STORE) ||
(frame->tf_scause == EXCP_STORE_PAGE_FAULT)) {
if (frame->tf_scause == EXCP_FAULT_STORE ||
frame->tf_scause == EXCP_STORE_PAGE_FAULT) {
access_type = PROT_WRITE;
} else if (frame->tf_scause == EXCP_INST_PAGE_FAULT) {
} else if (frame->tf_scause == EXCP_FAULT_FETCH ||
frame->tf_scause == EXCP_INST_PAGE_FAULT) {
access_type = PROT_EXEC;
} else {
access_type = PROT_READ;