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

Fix panic in from_which_and_id()

Browse Source
This commit is contained in:
Marsman1996 2024-08-21 20:43:37 +08:00 committed by Tate, Hongliang Tian
parent 1833f8047e
commit ec7391468c
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kernel/aster-nix/src/process/process_filter.rs
View File

@ -14,14 +14,15 @@ pub enum ProcessFilter {
impl ProcessFilter { impl ProcessFilter {
// used for waitid // used for waitid
pub fn from_which_and_id(which: u64, id: u64) -> Self { pub fn from_which_and_id(which: u64, id: u64) -> Result<Self> {
// Does not support PID_FD now(which = 3) // Does not support PID_FD now(which = 3)
// https://elixir.bootlin.com/linux/latest/source/include/uapi/linux/wait.h#L20 // https://elixir.bootlin.com/linux/latest/source/include/uapi/linux/wait.h#L20
match which { match which {
0 => ProcessFilter::Any, 0 => Ok(ProcessFilter::Any),
1 => ProcessFilter::WithPid(id as Pid), 1 => Ok(ProcessFilter::WithPid(id as Pid)),
2 => ProcessFilter::WithPgid(id as Pgid), 2 => Ok(ProcessFilter::WithPgid(id as Pgid)),
_ => panic!("Unknown id type"), 3 => todo!(),
_ => return_errno_with_message!(Errno::EINVAL, "invalid which"),
} }
} }

2
kernel/aster-nix/src/syscall/waitid.rs
View File

@ -15,7 +15,7 @@ pub fn sys_waitid(
_ctx: &Context, _ctx: &Context,
) -> Result<SyscallReturn> { ) -> Result<SyscallReturn> {
// FIXME: what does infoq and rusage use for? // FIXME: what does infoq and rusage use for?
let process_filter = ProcessFilter::from_which_and_id(which, upid); let process_filter = ProcessFilter::from_which_and_id(which, upid)?;
let wait_options = WaitOptions::from_bits(options as u32).expect("Unknown wait options"); let wait_options = WaitOptions::from_bits(options as u32).expect("Unknown wait options");
let waited_process = wait_child_exit(process_filter, wait_options)?; let waited_process = wait_child_exit(process_filter, wait_options)?;
let pid = waited_process.map_or(0, |process| process.pid()); let pid = waited_process.map_or(0, |process| process.pid());