Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-23 09:23:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add check during the conversion from timeval_t to Duration

Browse Source
This commit is contained in:
Marsman1996
2024-09-19 10:20:03 +08:00
committed by Tate, Hongliang Tian
parent 70505ff4f8
commit 4fa4e5ef2a
3 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/src/syscall/select.rs
View File

@ -19,8 +19,10 @@ pub fn sys_select(
let timeout = if timeval_addr == 0 {
None
} else {
let timeval = ctx.get_user_space().read_val::<timeval_t>(timeval_addr)?;
Some(Duration::from(timeval))
let mut timeval = ctx.get_user_space().read_val::<timeval_t>(timeval_addr)?;
timeval.sec += timeval.usec / 1_000_000;
timeval.usec %= 1_000_000;
Some(Duration::try_from(timeval)?)
};
do_sys_select(

4
kernel/src/syscall/setitimer.rs
View File

@ -34,8 +34,8 @@ pub fn sys_setitimer(
}
let user_space = ctx.get_user_space();
let new_itimerval = user_space.read_val::<itimerval_t>(new_itimerval_addr)?;
let interval = Duration::from(new_itimerval.it_interval);
let expire_time = Duration::from(new_itimerval.it_value);
let interval = Duration::try_from(new_itimerval.it_interval)?;
let expire_time = Duration::try_from(new_itimerval.it_value)?;
let process_timer_manager = ctx.process.timer_manager();
let timer = match ItimerType::try_from(itimer_type)? {