qiurui
/
asterinas
mirror of https://github.com/asterinas/asterinas.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a mmap `MAP_FIXED` issue

This commit is contained in:
Wang Siyuan 2024-12-23 06:50:52 +00:00 committed by Tate, Hongliang Tian
parent 1e3403e756
commit 6e46641a09
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,7 @@ use crate::{
prelude::*,
vm::{
perms::VmPerms,
vmar::is_userspace_vaddr,
vmo::{VmoOptions, VmoRightsOp},
},
};
@ -42,7 +43,7 @@ fn do_sys_mmap(
addr: Vaddr,
len: usize,
vm_perms: VmPerms,
option: MMapOptions,
mut option: MMapOptions,
fd: FileDesc,
offset: usize,
ctx: &Context,
@ -52,7 +53,11 @@ fn do_sys_mmap(
addr, len, vm_perms, option, fd, offset
);
check_option(&option)?;
if option.flags.contains(MMapFlags::MAP_FIXED_NOREPLACE) {
option.flags.insert(MMapFlags::MAP_FIXED);
}
check_option(addr, &option)?;
if len == 0 {
return_errno_with_message!(Errno::EINVAL, "mmap len cannot be zero");
@ -156,11 +161,15 @@ fn do_sys_mmap(
Ok(map_addr)
}
fn check_option(option: &MMapOptions) -> Result<()> {
fn check_option(addr: Vaddr, option: &MMapOptions) -> Result<()> {
if option.typ() == MMapType::File {
return_errno_with_message!(Errno::EINVAL, "Invalid mmap type");
}
if option.flags().contains(MMapFlags::MAP_FIXED) && !is_userspace_vaddr(addr) {
return_errno_with_message!(Errno::EINVAL, "Invalid mmap fixed addr");
}
Ok(())
}