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

Fix assertion failure constructing VmReaders from zero sized slices

Browse Source
This commit is contained in:
Zhang Junyang
2024-07-19 13:22:23 +00:00
committed by Tate, Hongliang Tian
parent 5aa28eae7e
commit 00b9bf9610
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ostd/src/mm/io.rs
View File

@ -340,8 +340,10 @@ impl<'a> VmReader<'a, KernelSpace> {
/// it should _not_ overlap with other `VmWriter`s. /// it should _not_ overlap with other `VmWriter`s.
/// The user space memory is treated as untyped. /// The user space memory is treated as untyped.
pub unsafe fn from_kernel_space(ptr: *const u8, len: usize) -> Self { pub unsafe fn from_kernel_space(ptr: *const u8, len: usize) -> Self {
debug_assert!(KERNEL_BASE_VADDR <= ptr as usize); // If casting a zero sized slice to a pointer, the pointer may be null
debug_assert!(ptr.add(len) as usize <= KERNEL_END_VADDR); // and does not reside in our kernel space range.
debug_assert!(len == 0 || KERNEL_BASE_VADDR <= ptr as usize);
debug_assert!(len == 0 || ptr.add(len) as usize <= KERNEL_END_VADDR);
Self { Self {
cursor: ptr, cursor: ptr,
@ -516,8 +518,10 @@ impl<'a> VmWriter<'a, KernelSpace> {
/// is typed, it should _not_ overlap with other `VmReader`s and `VmWriter`s. /// is typed, it should _not_ overlap with other `VmReader`s and `VmWriter`s.
/// The user space memory is treated as untyped. /// The user space memory is treated as untyped.
pub unsafe fn from_kernel_space(ptr: *mut u8, len: usize) -> Self { pub unsafe fn from_kernel_space(ptr: *mut u8, len: usize) -> Self {
debug_assert!(KERNEL_BASE_VADDR <= ptr as usize); // If casting a zero sized slice to a pointer, the pointer may be null
debug_assert!(ptr.add(len) as usize <= KERNEL_END_VADDR); // and does not reside in our kernel space range.
debug_assert!(len == 0 || KERNEL_BASE_VADDR <= ptr as usize);
debug_assert!(len == 0 || ptr.add(len) as usize <= KERNEL_END_VADDR);
Self { Self {
cursor: ptr, cursor: ptr,