Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 18:15:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOS:MM] Fix address space locking in MiProtectVirtualMemory

Browse source
This commit is contained in:
Timo Kreuzer 2023-10-09 22:01:56 +03:00
parent 6d701b4b05
commit a8b57f0a6b
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
ntoskrnl/mm/ARM3/virtual.c
View file

@ -2213,6 +2213,9 @@ MiProtectVirtualMemory(IN PEPROCESS Process,
PETHREAD Thread = PsGetCurrentThread(); PETHREAD Thread = PsGetCurrentThread();
TABLE_SEARCH_RESULT Result; TABLE_SEARCH_RESULT Result;
/* We must be attached */
ASSERT(Process == PsGetCurrentProcess());
/* Calculate base address for the VAD */ /* Calculate base address for the VAD */
StartingAddress = (ULONG_PTR)PAGE_ALIGN((*BaseAddress)); StartingAddress = (ULONG_PTR)PAGE_ALIGN((*BaseAddress));
EndingAddress = (((ULONG_PTR)*BaseAddress + *NumberOfBytesToProtect - 1) | (PAGE_SIZE - 1)); EndingAddress = (((ULONG_PTR)*BaseAddress + *NumberOfBytesToProtect - 1) | (PAGE_SIZE - 1));
@ -2225,18 +2228,6 @@ MiProtectVirtualMemory(IN PEPROCESS Process,
return STATUS_INVALID_PAGE_PROTECTION; return STATUS_INVALID_PAGE_PROTECTION;
} }
/* Check for ROS specific memory area */
MemoryArea = MmLocateMemoryAreaByAddress(&Process->Vm, *BaseAddress);
if ((MemoryArea) && (MemoryArea->Type != MEMORY_AREA_OWNED_BY_ARM3))
{
/* Evil hack */
return MiRosProtectVirtualMemory(Process,
BaseAddress,
NumberOfBytesToProtect,
NewAccessProtection,
OldAccessProtection);
}
/* Lock the address space and make sure the process isn't already dead */ /* Lock the address space and make sure the process isn't already dead */
AddressSpace = MmGetCurrentAddressSpace(); AddressSpace = MmGetCurrentAddressSpace();
MmLockAddressSpace(AddressSpace); MmLockAddressSpace(AddressSpace);
@ -2247,6 +2238,19 @@ MiProtectVirtualMemory(IN PEPROCESS Process,
goto FailPath; goto FailPath;
} }
/* Check for ROS specific memory area */
MemoryArea = MmLocateMemoryAreaByAddress(&Process->Vm, *BaseAddress);
if ((MemoryArea) && (MemoryArea->Type != MEMORY_AREA_OWNED_BY_ARM3))
{
/* Evil hack */
MmUnlockAddressSpace(AddressSpace);
return MiRosProtectVirtualMemory(Process,
BaseAddress,
NumberOfBytesToProtect,
NewAccessProtection,
OldAccessProtection);
}
/* Get the VAD for this address range, and make sure it exists */ /* Get the VAD for this address range, and make sure it exists */
Result = MiCheckForConflictingNode(StartingAddress >> PAGE_SHIFT, Result = MiCheckForConflictingNode(StartingAddress >> PAGE_SHIFT,
EndingAddress >> PAGE_SHIFT, EndingAddress >> PAGE_SHIFT,