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

Fix integer overflow caused by page align

Browse Source
This commit is contained in:
Marsman1996
2024-08-26 14:33:49 +08:00
committed by Tate, Hongliang Tian
parent 0a8ad6971a
commit e184094648
4 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/src/syscall/madvise.rs
View File

@ -20,7 +20,7 @@ pub fn sys_madvise(
if start % PAGE_SIZE != 0 {
return_errno_with_message!(Errno::EINVAL, "the start address should be page aligned");
}
if len == 0 {
if len == 0 || len > usize::MAX - PAGE_SIZE + 1 {
return Ok(SyscallReturn::Return(0));
}

3
kernel/src/syscall/mmap.rs
View File

@ -57,6 +57,9 @@ fn do_sys_mmap(
if len == 0 {
return_errno_with_message!(Errno::EINVAL, "mmap len cannot be zero");
}
if len > usize::MAX - PAGE_SIZE + 1 {
return_errno_with_message!(Errno::ENOMEM, "mmap len align overflow");
}
let len = len.align_up(PAGE_SIZE);

3
kernel/src/syscall/mprotect.rs
View File

@ -22,6 +22,9 @@ pub fn sys_mprotect(addr: Vaddr, len: usize, perms: u64, ctx: &Context) -> Resul
if len == 0 {
return Ok(SyscallReturn::Return(0));
}
if len > usize::MAX - PAGE_SIZE + 1 {
return_errno_with_message!(Errno::ENOMEM, "len align overflow");
}
let len = len.align_up(PAGE_SIZE);
let end = addr.checked_add(len).ok_or(Error::with_message(

3
kernel/src/syscall/munmap.rs
View File

@ -14,6 +14,9 @@ pub fn sys_munmap(addr: Vaddr, len: usize, ctx: &Context) -> Result<SyscallRetur
if len == 0 {
return_errno_with_message!(Errno::EINVAL, "munmap len cannot be zero");
}
if len > usize::MAX - PAGE_SIZE + 1 {
return_errno_with_message!(Errno::ENOMEM, "munmap len align overflow");
}
let root_vmar = ctx.process.root_vmar();
let len = len.align_up(PAGE_SIZE);