Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-16 08:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Never expose ERESTARTSYS to the userspace

Browse Source
This commit is contained in:
Ruihan Li 2025-02-21 10:29:35 +08:00 committed by Tate, Hongliang Tian
parent 8187fa2f1b
commit 18e0eae331
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
kernel/src/process/signal/mod.rs
View File

@ -48,8 +48,19 @@ pub fn handle_pending_signal(
ctx: &Context, ctx: &Context,
syscall_number: Option<usize>, syscall_number: Option<usize>,
) { ) {
// We first deal with signal in current thread, then signal in current process. let syscall_restart = if let Some(syscall_number) = syscall_number
&& user_ctx.syscall_ret() == -(Errno::ERESTARTSYS as i32) as usize
{
// We should never return `ERESTARTSYS` to the userspace.
user_ctx.set_syscall_ret(-(Errno::EINTR as i32) as usize);
Some(syscall_number)
} else {
None
};
let posix_thread = ctx.posix_thread; let posix_thread = ctx.posix_thread;
let current = ctx.process;
let signal = { let signal = {
let sig_mask = posix_thread.sig_mask().load(Ordering::Relaxed); let sig_mask = posix_thread.sig_mask().load(Ordering::Relaxed);
if let Some(signal) = posix_thread.dequeue_signal(&sig_mask) { if let Some(signal) = posix_thread.dequeue_signal(&sig_mask) {
@ -58,13 +69,14 @@ pub fn handle_pending_signal(
return; return;
} }
}; };
let sig_num = signal.num(); let sig_num = signal.num();
trace!("sig_num = {:?}, sig_name = {}", sig_num, sig_num.sig_name()); trace!("sig_num = {:?}, sig_name = {}", sig_num, sig_num.sig_name());
let current = posix_thread.process();
let mut sig_dispositions = current.sig_dispositions().lock(); let mut sig_dispositions = current.sig_dispositions().lock();
let sig_action = sig_dispositions.get(sig_num); let sig_action = sig_dispositions.get(sig_num);
trace!("sig action: {:x?}", sig_action); trace!("sig action: {:x?}", sig_action);
match sig_action { match sig_action {
SigAction::Ign => { SigAction::Ign => {
trace!("Ignore signal {:?}", sig_num); trace!("Ignore signal {:?}", sig_num);
@ -75,15 +87,17 @@ pub fn handle_pending_signal(
restorer_addr, restorer_addr,
mask, mask,
} => { } => {
if let Some(syscall_number) = syscall_number if let Some(syscall_number) = syscall_restart
&& user_ctx.syscall_ret() == -(Errno::ERESTARTSYS as i32) as usize && flags.contains(SigActionFlags::SA_RESTART)
{ {
if flags.contains(SigActionFlags::SA_RESTART) { #[cfg(target_arch = "x86_64")]
user_ctx.set_syscall_num(syscall_number); const SYSCALL_INSTR_LEN: usize = 2; // syscall
user_ctx.set_instruction_pointer(user_ctx.instruction_pointer() - 2); #[cfg(target_arch = "riscv64")]
} else { const SYSCALL_INSTR_LEN: usize = 4; // ecall
user_ctx.set_syscall_ret(-(Errno::EINTR as i32) as usize);
} user_ctx.set_syscall_num(syscall_number);
user_ctx
.set_instruction_pointer(user_ctx.instruction_pointer() - SYSCALL_INSTR_LEN);
} }
if flags.contains(SigActionFlags::SA_RESETHAND) { if flags.contains(SigActionFlags::SA_RESETHAND) {