andrey/rCore
1
0
Fork 0
mirror of https://github.com/rcore-os/rCore.git synced 2024-11-22 08:06:17 +04:00
Code Issues Projects Releases Wiki Activity

Fix signal masking

Browse Source
This commit is contained in:
Jiajie Chen 2020-06-29 20:48:42 +08:00
parent 8f0b2702f0
commit 34ca9963cb
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
kernel/src/signal/mod.rs
View File

@ -151,7 +151,10 @@ pub fn handle_signal(thread: &Arc<Thread>, tf: &mut UserContext) -> bool {
use Signal::*;
let signal: Signal = <Signal as FromPrimitive>::from_i32(info.signo).unwrap();
info!("process {} received signal: {:?}", process.pid, signal);
info!(
"process {} thread {} received signal: {:?}",
process.pid, thread.tid, signal
);
process.sig_queue.remove(idx);
process.pending_sigset.remove(signal);
@ -184,8 +187,19 @@ pub fn handle_signal(thread: &Arc<Thread>, tf: &mut UserContext) -> bool {
_ => {
info!("goto handler at {:#x}", action.handler);
// save original sig mask
let mut inner = thread.inner.lock();
let sig_mask = inner.sig_mask;
// update sig mask
// 1. block current
// 2. block mask in disposition
inner.sig_mask.add(signal);
inner.sig_mask.add_set(&action.mask);
// save original signal alternate stack
let stack = thread.inner.lock().signal_alternate_stack;
let stack = inner.signal_alternate_stack;
drop(inner);
let sig_sp = {
// use signal alternate stack when SA_ONSTACK is set
@ -229,7 +243,7 @@ pub fn handle_signal(thread: &Arc<Thread>, tf: &mut UserContext) -> bool {
link: 0,
stack,
context: MachineContext::from_tf(tf),
sig_mask: thread.inner.lock().sig_mask,
sig_mask,
};
if action_flags.contains(SignalActionFlags::RESTORER) {
frame.ret_code_addr = action.restorer; // legacy

7
kernel/src/syscall/signal.rs
View File

@ -60,12 +60,7 @@ impl Syscall<'_> {
frame.ucontext.context.fill_tf(&mut self.context);
// small hack: don't change ret when restoring
let ret = self.context.get_syscall_ret() as isize;
if ret >= 0 {
Ok(ret as usize)
} else {
Err(FromPrimitive::from_isize(-ret).unwrap())
}
Ok(self.context.get_syscall_ret())
}
pub fn sys_rt_sigprocmask(