Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-25 08:00:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOS:MM] Stop using memory areas in MmAccessFault

Browse source 
- Implement MiLocateVad and make MiLocateAddress call it
- Use MiLocateVad in MmAccessFault to get the VAD
- Check VadFlags for whether this is an ARM³ VAD/MEMORY_AREA
This commit is contained in:
Timo Kreuzer 2024-04-06 13:29:30 +03:00
parent fca88bb94d
commit ec45b8fde8
3 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ntoskrnl/mm/ARM3/miarm.h
View file

@ -2178,6 +2178,12 @@ MiIsPfnInUse(
IN PMMPFN Pfn1
);
PMMVAD
NTAPI
MiLocateVad(
_In_ PMM_AVL_TABLE Table,
_In_ PVOID VirtualAddress);
PMMVAD
NTAPI
MiLocateAddress(

11
ntoskrnl/mm/ARM3/vadnode.c
View file

@ -113,11 +113,10 @@ MiDbgAssertIsLockedForWrite(_In_ PMM_AVL_TABLE Table)
PMMVAD
NTAPI
MiLocateAddress(IN PVOID VirtualAddress)
MiLocateVad(_In_ PMM_AVL_TABLE Table, _In_ PVOID VirtualAddress)
{
PMMVAD FoundVad;
ULONG_PTR Vpn;
PMM_AVL_TABLE Table = &PsGetCurrentProcess()->VadRoot;
TABLE_SEARCH_RESULT SearchResult;
ASSERT_LOCKED_FOR_READ(Table);
@ -145,6 +144,14 @@ MiLocateAddress(IN PVOID VirtualAddress)
return FoundVad;
}
PMMVAD
NTAPI
MiLocateAddress(_In_ PVOID VirtualAddress)
{
PMM_AVL_TABLE Table = &PsGetCurrentProcess()->VadRoot;
return MiLocateVad(Table, VirtualAddress);
}
TABLE_SEARCH_RESULT
NTAPI
MiCheckForConflictingNode(IN ULONG_PTR StartVpn,

18
ntoskrnl/mm/mmfault.c
View file

@ -16,6 +16,8 @@
#define MODULE_INVOLVED_IN_ARM3
#include "ARM3/miarm.h"
extern MM_AVL_TABLE MiRosKernelVadRoot;
/* PRIVATE FUNCTIONS **********************************************************/
NTSTATUS
@ -220,7 +222,7 @@ MmAccessFault(IN ULONG FaultCode,
IN KPROCESSOR_MODE Mode,
IN PVOID TrapInformation)
{
PMEMORY_AREA MemoryArea = NULL;
PMMVAD Vad = NULL;
NTSTATUS Status;
BOOLEAN IsArm3Fault = FALSE;
@ -253,9 +255,9 @@ MmAccessFault(IN ULONG FaultCode,
{
/* Check if this is an ARM3 memory area */
MiLockWorkingSetShared(PsGetCurrentThread(), &MmSystemCacheWs);
MemoryArea = MmLocateMemoryAreaByAddress(MmGetKernelAddressSpace(), Address);
Vad = MiLocateVad(&MiRosKernelVadRoot, Address);
if ((MemoryArea != NULL) && (MemoryArea->Type == MEMORY_AREA_OWNED_BY_ARM3))
if ((Vad != NULL) && !MI_IS_ROSMM_VAD(Vad))
{
IsArm3Fault = TRUE;
}
@ -266,9 +268,9 @@ MmAccessFault(IN ULONG FaultCode,
{
/* Could this be a VAD fault from user-mode? */
MiLockProcessWorkingSetShared(PsGetCurrentProcess(), PsGetCurrentThread());
MemoryArea = MmLocateMemoryAreaByAddress(MmGetCurrentAddressSpace(), Address);
Vad = MiLocateVad(&PsGetCurrentProcess()->VadRoot, Address);
if ((MemoryArea != NULL) && (MemoryArea->Type == MEMORY_AREA_OWNED_BY_ARM3))
if ((Vad != NULL) && !MI_IS_ROSMM_VAD(Vad))
{
IsArm3Fault = TRUE;
}
@ -277,15 +279,15 @@ MmAccessFault(IN ULONG FaultCode,
}
}
/* Is this an ARM3 memory area, or is there no address space yet? */
/* Is this an ARM3 VAD, or is there no address space yet? */
if (IsArm3Fault ||
((MemoryArea == NULL) &&
((Vad == NULL) &&
((ULONG_PTR)Address >= (ULONG_PTR)MmPagedPoolStart) &&
((ULONG_PTR)Address < (ULONG_PTR)MmPagedPoolEnd)) ||
(!MmGetKernelAddressSpace()))
{
/* This is an ARM3 fault */
DPRINT("ARM3 fault %p\n", MemoryArea);
DPRINT("ARM3 fault %p\n", Vad);
return MmArmAccessFault(FaultCode, Address, Mode, TrapInformation);
}