Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions kernel/src/arch/x86_64/ipc/signal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ use crate::{
},
},
mm::MemoryManagementArch,
process::ProcessManager,
process::{ProcessFlags, ProcessManager},
syscall::user_access::{UserBufferReader, UserBufferWriter},
};

Expand Down Expand Up @@ -714,6 +714,11 @@ unsafe fn do_signal(frame: &mut TrapFrame, got_signal: &mut bool) {
let mut info: Option<SigInfo>;
let mut sigaction: Option<Sigaction>;
let sig_block: SigSet = *siginfo_read_guard.sig_blocked();
let frame_oldset = if pcb.flags().contains(ProcessFlags::RESTORE_SIG_MASK) {
*siginfo_read_guard.saved_sigmask()
} else {
sig_block
};
drop(siginfo_read_guard);

loop {
Expand Down Expand Up @@ -783,8 +788,8 @@ unsafe fn do_signal(frame: &mut TrapFrame, got_signal: &mut bool) {
}
}

let oldset = sig_block;
// no sig_struct guard to drop
pcb.flags().remove(ProcessFlags::RESTORE_SIG_MASK);
drop(pcb);
// 做完上面的检查后,开中断
CurrentIrqArch::interrupt_enable();
Expand Down Expand Up @@ -813,7 +818,8 @@ unsafe fn do_signal(frame: &mut TrapFrame, got_signal: &mut bool) {
}
*got_signal = true;

let mut blocked = oldset | sigaction.mask();
let oldset = frame_oldset;
let mut blocked = sig_block | sigaction.mask();
if !sigaction.flags().contains(SigFlags::SA_NODEFER) {
blocked.insert(sig_number.into());
}
Expand Down
Loading
Loading