From edecbf47993c2f0926bc94e7676e836324cea10f Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Sat, 6 Apr 2024 22:10:29 +0300
Subject: [PATCH] [NTOS:MM] Remove usage of memory area in MiUnmapViewOfSection
---
ntoskrnl/mm/ARM3/section.c | 28 +++++++++++++---------------
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/ntoskrnl/mm/ARM3/section.c b/ntoskrnl/mm/ARM3/section.c
index e362eb86e66..43c925a2d09 100644
--- a/ntoskrnl/mm/ARM3/section.c
+++ b/ntoskrnl/mm/ARM3/section.c
@@ -805,7 +805,6 @@ MiUnmapViewOfSection(IN PEPROCESS Process,
IN PVOID BaseAddress,
IN ULONG Flags)
{
- PMEMORY_AREA MemoryArea;
BOOLEAN Attached = FALSE;
KAPC_STATE ApcState;
PMMVAD Vad;
@@ -819,11 +818,21 @@ MiUnmapViewOfSection(IN PEPROCESS Process,
/* Check if we need to lock the address space */
if (!Flags) MmLockAddressSpace(&Process->Vm);
- /* Check for Mm Region */
- MemoryArea = MmLocateMemoryAreaByAddress(&Process->Vm, BaseAddress);
- if ((MemoryArea) && (MemoryArea->Type != MEMORY_AREA_OWNED_BY_ARM3))
+ /* Find the VAD for the address and make sure it's a section VAD */
+ Vad = MiLocateVad(&Process->VadRoot, BaseAddress);
+ if (!(Vad) || (Vad->u.VadFlags.PrivateMemory))
+ {
+ /* Couldn't find it, or invalid VAD, fail */
+ DPRINT1("No VAD or invalid VAD\n");
+ if (!Flags) MmUnlockAddressSpace(&Process->Vm);
+ return STATUS_NOT_MAPPED_VIEW;
+ }
+
+ /* Check for RosMm memory area */
+ if (MI_IS_MEMORY_AREA_VAD(Vad))
{
/* Call Mm API */
+ ASSERT(MI_IS_ROSMM_VAD(Vad));
NTSTATUS Status = MiRosUnmapViewOfSection(Process, BaseAddress, Process->ProcessExiting);
if (!Flags) MmUnlockAddressSpace(&Process->Vm);
return Status;
@@ -847,17 +856,6 @@ MiUnmapViewOfSection(IN PEPROCESS Process,
goto Quickie;
}
- /* Find the VAD for the address and make sure it's a section VAD */
- Vad = MiLocateAddress(BaseAddress);
- if (!(Vad) || (Vad->u.VadFlags.PrivateMemory))
- {
- /* Couldn't find it, or invalid VAD, fail */
- DPRINT1("No VAD or invalid VAD\n");
- if (!Flags) MmUnlockAddressSpace(&Process->Vm);
- Status = STATUS_NOT_MAPPED_VIEW;
- goto Quickie;
- }
-
/* We should be attached */
ASSERT(Process == PsGetCurrentProcess());