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

Fix some user space address check

Browse Source
This commit is contained in:
Wang Siyuan
2025-06-23 06:56:11 +00:00
committed by Junyang Zhang
parent f442cc6d81
commit a0cbe7551a
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,7 +56,7 @@ fn do_sys_mmap(
option.flags.insert(MMapFlags::MAP_FIXED); option.flags.insert(MMapFlags::MAP_FIXED);
} }
check_option(addr, &option)?; check_option(addr, len, &option)?;
if len == 0 { if len == 0 {
return_errno_with_message!(Errno::EINVAL, "mmap len cannot be zero"); return_errno_with_message!(Errno::EINVAL, "mmap len cannot be zero");
@ -153,12 +153,15 @@ fn do_sys_mmap(
Ok(map_addr) Ok(map_addr)
} }
fn check_option(addr: Vaddr, option: &MMapOptions) -> Result<()> { fn check_option(addr: Vaddr, size: usize, option: &MMapOptions) -> Result<()> {
if option.typ() == MMapType::File { if option.typ() == MMapType::File {
return_errno_with_message!(Errno::EINVAL, "Invalid mmap type"); return_errno_with_message!(Errno::EINVAL, "Invalid mmap type");
} }
if option.flags().contains(MMapFlags::MAP_FIXED) && !is_userspace_vaddr(addr) { let map_end = addr.checked_add(size).ok_or(Errno::EINVAL)?;
if option.flags().contains(MMapFlags::MAP_FIXED)
&& !(is_userspace_vaddr(addr) && is_userspace_vaddr(map_end - 1))
{
return_errno_with_message!(Errno::EINVAL, "Invalid mmap fixed addr"); return_errno_with_message!(Errno::EINVAL, "Invalid mmap fixed addr");
} }

4
kernel/src/vm/vmar/mod.rs
View File

@ -391,7 +391,7 @@ impl VmarInner {
let old_map_end = map_addr + old_size; let old_map_end = map_addr + old_size;
let new_map_end = map_addr.checked_add(new_size).ok_or(Errno::EINVAL)?; let new_map_end = map_addr.checked_add(new_size).ok_or(Errno::EINVAL)?;
if !is_userspace_vaddr(new_map_end) { if !is_userspace_vaddr(new_map_end - 1) {
return_errno_with_message!(Errno::EINVAL, "resize to a invalid new size"); return_errno_with_message!(Errno::EINVAL, "resize to a invalid new size");
} }
@ -604,7 +604,7 @@ impl Vmar_ {
let new_range = new_addr..new_addr.checked_add(new_size).ok_or(Errno::EINVAL)?; let new_range = new_addr..new_addr.checked_add(new_size).ok_or(Errno::EINVAL)?;
if new_addr % PAGE_SIZE != 0 if new_addr % PAGE_SIZE != 0
|| !is_userspace_vaddr(new_addr) || !is_userspace_vaddr(new_addr)
|| !is_userspace_vaddr(new_range.end) || !is_userspace_vaddr(new_range.end - 1)
{ {
return_errno_with_message!(Errno::EINVAL, "remap: invalid fixed new addr"); return_errno_with_message!(Errno::EINVAL, "remap: invalid fixed new addr");
} }