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

[NTOSKRNL]

Browse source 
- Release the address space lock before entering SEH because an exception would result in recursive acquisition of the address space lock when the fault handler tries to grab it

svn path=/trunk/; revision=54579
This commit is contained in:
Cameron Gutman 2011-12-04 08:25:35 +00:00
parent 16d77664e7
commit 4ce4744000
1 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
reactos/ntoskrnl/mm/anonmem.c
View file

@ -1004,8 +1004,8 @@ NtFreeVirtualMemory(IN HANDLE ProcessHandle,
NTSTATUS Status;
PEPROCESS Process;
PMMSUPPORT AddressSpace;
PVOID BaseAddress, PBaseAddress;
SIZE_T RegionSize, PRegionSize;
PVOID BaseAddress = NULL, PBaseAddress;
SIZE_T RegionSize = 0, PRegionSize;
PEPROCESS CurrentProcess = PsGetCurrentProcess();
KPROCESSOR_MODE PreviousMode = KeGetPreviousMode();
KAPC_STATE ApcState;
@ -1183,22 +1183,26 @@ NtFreeVirtualMemory(IN HANDLE ProcessHandle,
goto unlock_deref_and_return;
}
/* Enter SEH */
_SEH2_TRY
{
/* Copy rounded values back in success case */
*UBaseAddress = BaseAddress;
*URegionSize = RegionSize;
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
Status = _SEH2_GetExceptionCode();
DPRINT1("Failed to copy values back! (Status: 0x%x)\n", Status);
}
_SEH2_END;
unlock_deref_and_return:
MmUnlockAddressSpace(AddressSpace);
/* Copy rounded values back in success case */
if (NT_SUCCESS(Status))
{
/* Enter SEH */
_SEH2_TRY
{
*UBaseAddress = BaseAddress;
*URegionSize = RegionSize;
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
Status = _SEH2_GetExceptionCode();
DPRINT1("Failed to copy values back! (Status: 0x%x)\n", Status);
}
_SEH2_END;
}
if (Attached) KeUnstackDetachProcess(&ApcState);
if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process);