From 0be1b8b94c84a73b530e310cb9031475a59a16f6 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Mon, 23 Mar 2020 12:58:13 +0800 Subject: [PATCH] kernel: mem: don't unilaterally hand memory to userspace If it's needed for use in the kernel, don't hand it over. Signed-off-by: Sean Cross --- kernel/src/mem.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kernel/src/mem.rs b/kernel/src/mem.rs index c27055a7e..4816d250d 100644 --- a/kernel/src/mem.rs +++ b/kernel/src/mem.rs @@ -349,7 +349,7 @@ impl MemoryManager { /// Attempt to allocate a single page from the default section. /// Note that this will be backed by a real page. - pub fn map_zeroed_page(&mut self, pid: PID) -> Result<*mut usize, xous::Error> { + pub fn map_zeroed_page(&mut self, pid: PID, is_user: bool) -> Result<*mut usize, xous::Error> { let virt = self.find_virtual_address(0 as *mut usize, PAGE_SIZE, xous::MemoryType::Default)?; @@ -372,7 +372,9 @@ impl MemoryManager { // Zero-out the page unsafe { virt.write_bytes(0, PAGE_SIZE / mem::size_of::()) }; - crate::arch::mem::hand_page_to_user(virt)?; + if is_user { + crate::arch::mem::hand_page_to_user(virt)?; + } Ok(virt) }