From 006a50d206870a1794740c1788fc7a6a15b4ee44 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Mon, 25 Dec 2023 23:30:26 +0800 Subject: [PATCH] kernel: mem: fix memory zeroing Fix memory zeroing when requesting a physical pointer. Previously, only the first 25% of a page was zeroed due to a bug when casting between *mut u8 and *mut usize. This now uses `write_volatile` to ensure the memory clear isn't optimized out, and uses `usize` pointers everywhere. Signed-off-by: Sean Cross --- kernel/src/mem.rs | 17 ++++++++++++++++- kernel/src/syscall.rs | 7 ++++--- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/kernel/src/mem.rs b/kernel/src/mem.rs index 4bd0d942f..5c38f90fe 100644 --- a/kernel/src/mem.rs +++ b/kernel/src/mem.rs @@ -451,7 +451,11 @@ impl MemoryManager { let virt = virt as *mut usize; // Zero-out the page - unsafe { virt.write_bytes(0, PAGE_SIZE / core::mem::size_of::()) }; + let range_start = virt; + let range_end = range_start.wrapping_add(PAGE_SIZE / core::mem::size_of::()); + unsafe { + crate::mem::bzero(range_start, range_end); + }; if is_user { crate::arch::mem::hand_page_to_user(virt as _)?; } @@ -870,3 +874,14 @@ impl MemoryManager { Ok(()) } } + +pub unsafe fn bzero(mut start: *mut T, end: *mut T) +where + T: Copy, +{ + while start < end { + // NOTE(volatile) to prevent this from being transformed into `memclr` + core::ptr::write_volatile(start, core::mem::zeroed()); + start = start.offset(1); + } +} diff --git a/kernel/src/syscall.rs b/kernel/src/syscall.rs index fdb588259..761b5fa46 100644 --- a/kernel/src/syscall.rs +++ b/kernel/src/syscall.rs @@ -833,10 +833,11 @@ pub fn handle_inner(pid: PID, tid: TID, in_irq: bool, call: SysCall) -> SysCallR if !phys_ptr.is_null() { if mm.is_main_memory(phys_ptr) { + let range_start = range.as_mut_ptr() as *mut usize; + let range_end = + range_start.wrapping_add(range.len() / core::mem::size_of::()); unsafe { - range - .as_mut_ptr() - .write_bytes(0, range.len() / core::mem::size_of::()) + crate::mem::bzero(range_start, range_end); }; } for offset in (range.as_ptr() as usize..(range.as_ptr() as usize + range.len()))