DragonOS-Community/DragonOS
4
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-19 00:46:31 +00:00
Code Issues Releases Wiki Activity

bugfix: 修复无法sleep的问题以及进程处于block(true)状态时无法被信号唤醒&唤醒后不处理信号的问题 (#470)

Browse Source
This commit is contained in:
LoGin
2023-12-19 11:56:14 +08:00
committed by GitHub
parent 24ff1faffb
commit 8612b6ce7a
8 changed files with 64 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/src/arch/x86_64/asm/entry.S
View File

@ -374,6 +374,10 @@ ENTRY(syscall_64)
callq *%rdx //调用服务程序
// 将原本要返回的栈帧的栈指针传入do_signal的第一个参数
movq %rsp, %rdi
callq do_signal
cli
// === 恢复调用现场 ===

2
kernel/src/arch/x86_64/ipc/signal.rs
View File

@ -495,7 +495,7 @@ impl SignalArch for X86_64SignalArch {
}
fn sys_rt_sigreturn(trap_frame: &mut TrapFrame) -> u64 {
let frame = (trap_frame.rsp as usize) as *mut SigFrame;
let frame = (trap_frame.rsp as usize - size_of::<u64>()) as *mut SigFrame;
// 如果当前的rsp不来自用户态，则认为产生了错误（或被SROP攻击）
if UserBufferWriter::new(frame, size_of::<SigFrame>(), true).is_err() {