From 9aa83bbfb535c7d69c94837a84cceb405b58e402 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Sun, 29 May 2022 19:38:22 +0800 Subject: [PATCH] kernel: unmap child process pages after setup Unmap the pages from the child process after we're done setting them up. This ensures they're not still aliased by our process, despite being marked as "owned" by the other process. Signed-off-by: Sean Cross --- kernel/src/arch/riscv/mem.rs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/kernel/src/arch/riscv/mem.rs b/kernel/src/arch/riscv/mem.rs index f6f4e271a..1df5dbc08 100644 --- a/kernel/src/arch/riscv/mem.rs +++ b/kernel/src/arch/riscv/mem.rs @@ -226,11 +226,18 @@ impl MemoryMapping { .add(pages_l0_vpn0) .write_volatile(pages_l0_ppn); + // Mark the four pages as being owned by the new process memory_manager.move_page_raw(root_phys as *mut usize, pid)?; memory_manager.move_page_raw(pages_l0_phys as *mut usize, pid)?; memory_manager.move_page_raw(process_l0_phys as *mut usize, pid)?; memory_manager.move_page_raw(context_phys as *mut usize, pid)?; + // Unmap our copies of the four pages + unmap_page_inner(memory_manager, root_temp_virt as usize)?; + unmap_page_inner(memory_manager, pages_l0_temp_virt as usize)?; + unmap_page_inner(memory_manager, process_l0_temp_virt as usize)?; + unmap_page_inner(memory_manager, context_temp_virt as usize)?; + // Construct a dummy SATP that we will use to hand memory to the new process. self.satp = 0x8000_0000 | ((pid.get() as usize) << 22) | (root_phys as usize >> 12); Ok(())