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

Fix the potential bugs of read and write in Vmar

Browse Source
This commit is contained in:
Chen Chengjun
2024-04-19 16:01:48 +08:00
committed by Tate, Hongliang Tian
parent d1990869ae
commit ff3ff0a598
1 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
kernel/aster-nix/src/vm/vmar/mod.rs
View File

@ -8,7 +8,7 @@ mod options;
mod static_cap; mod static_cap;
pub mod vm_mapping; pub mod vm_mapping;
use core::ops::Range; use core::{cmp::min, ops::Range};
use align_ext::AlignExt; use align_ext::AlignExt;
use aster_frame::vm::{VmSpace, MAX_USERSPACE_VADDR}; use aster_frame::vm::{VmSpace, MAX_USERSPACE_VADDR};
@ -429,13 +429,28 @@ impl Vmar_ {
} }
// If the read range is in mapped vmo. // If the read range is in mapped vmo.
let mut read_offset = 0;
for vm_mapping in inner.vm_mappings.find(&read_range) { for vm_mapping in inner.vm_mappings.find(&read_range) {
let vm_mapping_range = vm_mapping.range(); let vm_mapping_range = vm_mapping.range();
if vm_mapping_range.start <= read_start && read_end <= vm_mapping_range.end { let current_start = read_start + read_offset;
let vm_mapping_offset = read_start - vm_mapping_range.start; if vm_mapping_range.start <= current_start {
return vm_mapping.read_bytes(vm_mapping_offset, buf); let buf_len = min(
buf.len() - read_offset,
vm_mapping_range.end - current_start,
);
let vm_mapping_offset = current_start - vm_mapping_range.start;
vm_mapping.read_bytes(
vm_mapping_offset,
buf.get_mut(read_offset..buf_len).unwrap(),
)?;
read_offset += buf_len;
} else {
return_errno_with_message!(Errno::EACCES, "read range is not fully mapped");
} }
} }
if read_offset == buf.len() {
return Ok(());
}
// FIXME: If the read range is across different vmos or child vmars, should we directly return error? // FIXME: If the read range is across different vmos or child vmars, should we directly return error?
return_errno_with_message!(Errno::EACCES, "read range is not backed up by a vmo"); return_errno_with_message!(Errno::EACCES, "read range is not backed up by a vmo");
@ -464,13 +479,26 @@ impl Vmar_ {
} }
// If the write range is in mapped vmo. // If the write range is in mapped vmo.
let mut write_offset = 0;
for vm_mapping in inner.vm_mappings.find(&write_range) { for vm_mapping in inner.vm_mappings.find(&write_range) {
let vm_mapping_range = vm_mapping.range(); let vm_mapping_range = vm_mapping.range();
if vm_mapping_range.start <= write_start && write_end <= vm_mapping_range.end { let current_start = write_start + write_offset;
let vm_mapping_offset = write_start - vm_mapping_range.start; if vm_mapping_range.start <= current_start {
return vm_mapping.write_bytes(vm_mapping_offset, buf); let buf_len = min(
buf.len() - write_offset,
vm_mapping_range.end - current_start,
);
let vm_mapping_offset = current_start - vm_mapping_range.start;
vm_mapping
.write_bytes(vm_mapping_offset, buf.get(write_offset..buf_len).unwrap())?;
write_offset += buf_len;
} else {
return_errno_with_message!(Errno::EACCES, "write range is not fully mapped");
} }
} }
if write_offset == buf.len() {
return Ok(());
}
// FIXME: If the write range is across different vmos or child vmars, should we directly return error? // FIXME: If the write range is across different vmos or child vmars, should we directly return error?
return_errno_with_message!(Errno::EACCES, "write range is not backed up by a vmo"); return_errno_with_message!(Errno::EACCES, "write range is not backed up by a vmo");