From 93d295b93bd25ac9c062f0379422f7389f091677 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Wed, 3 Mar 2021 21:12:09 +0800 Subject: [PATCH] kernel: riscv: fix memory reuse bug Memory that was marked as reserved-but-not-in-use could get reallocated. Practically speaking, this caused threads to share stack, which makes things spooky. Signed-off-by: Sean Cross --- kernel/src/arch/riscv/mem.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/kernel/src/arch/riscv/mem.rs b/kernel/src/arch/riscv/mem.rs index 26208df97..fb6007d63 100644 --- a/kernel/src/arch/riscv/mem.rs +++ b/kernel/src/arch/riscv/mem.rs @@ -593,6 +593,12 @@ pub fn virt_to_phys(virt: usize) -> Result { // Ensure the entry hasn't already been mapped. if l0_pt.entries[vpn0] & MMUFlags::VALID.bits() == 0 { + // The memory has been reserved, but isn't pointing anywhere yet. + if l0_pt.entries[vpn0] != 0 { + return Err(xous_kernel::Error::MemoryInUse); + } + + // The address hasn't been allocated return Err(xous_kernel::Error::BadAddress); } Ok((l0_pt.entries[vpn0] >> 10) << 12)