mirror/moss-kernel
1
0
Fork 0
mirror of https://github.com/hexagonal-sun/moss-kernel.git synced 2026-01-31 09:31:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

arch: arm64: signal: use VDSO for sigreturn

Browse Source 
Support non SA_RESTORER sigactions by using the trampoline in the kernel
VDSO.
This commit is contained in:
Matthew Leach
2026-01-09 06:38:20 +00:00
parent 4101e9ff11
commit 97c07cd31f
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/arch/arm64/proc/signal.rs
View File

@@ -1,3 +1,4 @@
use super::vdso::VDSO_BASE;
use crate::{
arch::arm64::exceptions::ExceptionState,
memory::uaccess::{UserCopyable, copy_from_user, copy_to_user},
@@ -36,9 +37,12 @@ pub async fn do_signal(id: SigId, sa: UserspaceSigAction) -> Result<ExceptionSta
alt_stack_prev_addr: UA::null(),
};
if !sa.flags.contains(SigActionFlags::SA_RESTORER) {
panic!("Cannot call non-sa_restorer sig handler");
}
// Use the provided restorer trampoline, or the one provided by the VDSO if
// not.
let restorer = sa
.restorer
.map(|x| x.value())
.unwrap_or_else(|| VDSO_BASE.value());
let addr: TUA<RtSigFrame> = if sa.flags.contains(SigActionFlags::SA_ONSTACK)
&& let Some(alt_stack) = signal.alt_stack.as_mut()
@@ -56,7 +60,7 @@ pub async fn do_signal(id: SigId, sa: UserspaceSigAction) -> Result<ExceptionSta
new_state.sp_el0 = addr.value() as _;
new_state.elr_el1 = sa.action.value() as _;
new_state.x[30] = sa.restorer.unwrap().value() as _;
new_state.x[30] = restorer as _;
new_state.x[0] = id.user_id();
Ok(new_state)