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

Add more boundary checks for epoll_wait

Browse Source
This commit is contained in:
Fabing Li
2024-10-29 03:22:48 +00:00
committed by Tate, Hongliang Tian
parent dc06d7c37d
commit 3461bd5de6
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kernel/src/syscall/epoll.rs
View File

@ -14,6 +14,9 @@ use crate::{
process::signal::sig_mask::SigMask, process::signal::sig_mask::SigMask,
}; };
// See: https://elixir.bootlin.com/linux/v6.11.5/source/fs/eventpoll.c#L2437
const EP_MAX_EVENTS: usize = i32::MAX as usize / core::mem::size_of::<c_epoll_event>();
pub fn sys_epoll_create(size: i32, ctx: &Context) -> Result<SyscallReturn> { pub fn sys_epoll_create(size: i32, ctx: &Context) -> Result<SyscallReturn> {
if size <= 0 { if size <= 0 {
return_errno_with_message!(Errno::EINVAL, "size is not positive"); return_errno_with_message!(Errno::EINVAL, "size is not positive");
@ -95,8 +98,8 @@ fn do_epoll_wait(
ctx: &Context, ctx: &Context,
) -> Result<Vec<EpollEvent>> { ) -> Result<Vec<EpollEvent>> {
let max_events = { let max_events = {
if max_events <= 0 { if max_events <= 0 || max_events as usize > EP_MAX_EVENTS {
return_errno_with_message!(Errno::EINVAL, "max_events is not positive"); return_errno_with_message!(Errno::EINVAL, "max_events is not valid");
} }
max_events as usize max_events as usize
}; };
@ -192,7 +195,7 @@ pub fn sys_epoll_pwait(
epfd, events_addr, max_events, timeout, sigmask, sigset_size epfd, events_addr, max_events, timeout, sigmask, sigset_size
); );
if sigset_size != 8 { if sigmask != 0 && sigset_size != 8 {
return_errno_with_message!(Errno::EINVAL, "sigset size is not equal to 8"); return_errno_with_message!(Errno::EINVAL, "sigset size is not equal to 8");
} }

6
test/syscall_test/blocklists/epoll_test
View File

@ -1,12 +1,6 @@
EpollTest.Timeout_NoRandomSave EpollTest.Timeout_NoRandomSave
EpollTest.TimeoutNoFds
EpollTest.UnblockWithNewFD
EpollTest.Oneshot
EpollTest.EdgeTriggered_NoRandomSave
EpollTest.OneshotAndEdgeTriggered
EpollTest.CycleOfOneDisallowed EpollTest.CycleOfOneDisallowed
EpollTest.CycleOfThreeDisallowed EpollTest.CycleOfThreeDisallowed
EpollTest.CloseFile
# `UnblockWithSignal` contains races. Better not to enable it. # `UnblockWithSignal` contains races. Better not to enable it.
# See https://github.com/asterinas/asterinas/pull/1035 for details. # See https://github.com/asterinas/asterinas/pull/1035 for details.
EpollTest.UnblockWithSignal EpollTest.UnblockWithSignal