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

Support other SigStackFlags

Browse Source
This commit is contained in:
Fabing Li
2024-11-01 06:54:48 +00:00
committed by Tate, Hongliang Tian
parent 561516df98
commit 7a08d9a660
4 changed files with 41 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
kernel/src/syscall/sigaltstack.rs
View File

@ -36,14 +36,23 @@ fn get_old_stack(
return Ok(());
}
let Some(old_stack) = old_stack else {
return Ok(());
};
if let Some(old_stack) = old_stack {
debug!("old stack = {:?}", old_stack);
debug!("old stack = {:?}", old_stack);
let stack = stack_t::from(old_stack.clone());
ctx.get_user_space()
.write_val::<stack_t>(old_sig_stack_addr, &stack)?;
} else {
let stack = stack_t {
sp: 0,
flags: SigStackFlags::SS_DISABLE.bits() as i32,
size: 0,
};
ctx.get_user_space()
.write_val::<stack_t>(old_sig_stack_addr, &stack)?;
}
let stack = stack_t::from(old_stack.clone());
ctx.get_user_space().write_val(old_sig_stack_addr, &stack)
Ok(())
}
fn set_new_stack(sig_stack_addr: Vaddr, old_stack: Option<&SigStack>, ctx: &Context) -> Result<()> {
@ -88,13 +97,20 @@ impl TryFrom<stack_t> for SigStack {
return_errno_with_message!(Errno::EINVAL, "negative flags");
}
let flags = SigStackFlags::from_bits(stack.flags as u32)
let mut flags = SigStackFlags::from_bits(stack.flags as u32)
.ok_or_else(|| Error::with_message(Errno::EINVAL, "invalid flags"))?;
if flags.contains(SigStackFlags::SS_DISABLE) {
return Ok(Self::new(0, flags, 0));
}
if stack.size < MINSTKSZ {
return_errno_with_message!(Errno::ENOMEM, "stack size is less than MINSTKSZ");
}
if flags.is_empty() {
flags.insert(SigStackFlags::SS_ONSTACK);
}
Ok(Self::new(stack.sp, flags, stack.size))
}
}
@ -102,6 +118,7 @@ impl TryFrom<stack_t> for SigStack {
impl From<SigStack> for stack_t {
fn from(stack: SigStack) -> Self {
let flags = stack.flags().bits() as i32 | stack.status() as i32;
Self {
sp: stack.base(),
flags,