https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a1f6a6bdc3709b3abb9663eabfd74b5942075cb2
commit a1f6a6bdc3709b3abb9663eabfd74b5942075cb2 Author: Mark Jansen <[email protected]> AuthorDate: Mon Mar 11 22:48:37 2019 +0100 Commit: Mark Jansen <[email protected]> CommitDate: Thu Mar 14 20:02:01 2019 +0100 [LDR] Do not call module entrypoints while loading the shim engine. Manually call the shim engine entrypoint CORE-15846 --- dll/ntdll/ldr/ldrutils.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/dll/ntdll/ldr/ldrutils.c b/dll/ntdll/ldr/ldrutils.c index 6058a70335..75fc45fd92 100644 --- a/dll/ntdll/ldr/ldrutils.c +++ b/dll/ntdll/ldr/ldrutils.c @@ -2696,7 +2696,8 @@ PVOID LdrpGetShimEngineFunction(PCSZ FunctionName) NTSTATUS Status; PVOID Address; RtlInitAnsiString(&Function, FunctionName); - Status = LdrGetProcedureAddress(g_pShimEngineModule, &Function, 0, &Address); + /* Skip Dll init */ + Status = LdrpGetProcedureAddress(g_pShimEngineModule, &Function, 0, &Address, FALSE); return NT_SUCCESS(Status) ? Address : NULL; } @@ -2725,6 +2726,40 @@ LdrpGetShimEngineInterface() } } +VOID +NTAPI +LdrpRunShimEngineInitRoutine(IN ULONG Reason) +{ + PLIST_ENTRY ListHead, Next; + PLDR_DATA_TABLE_ENTRY LdrEntry; + + ListHead = &NtCurrentPeb()->Ldr->InLoadOrderModuleList; + Next = ListHead->Flink; + while (Next != ListHead) + { + LdrEntry = CONTAINING_RECORD(Next, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); + + if (g_pShimEngineModule == LdrEntry->DllBase) + { + if (LdrEntry->EntryPoint) + { + _SEH2_TRY + { + LdrpCallInitRoutine(LdrEntry->EntryPoint, LdrEntry->DllBase, Reason, NULL); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + DPRINT1("WARNING: Exception 0x%x during LdrpRunShimEngineInitRoutine(%u)\n", + _SEH2_GetExceptionCode(), Reason); + } + _SEH2_END; + } + return; + } + + Next = Next->Flink; + } +} VOID NTAPI @@ -2734,10 +2769,13 @@ LdrpLoadShimEngine(IN PWSTR ImageName, IN PUNICODE_STRING ProcessImage, IN PVOID PVOID ShimLibrary; NTSTATUS Status; RtlInitUnicodeString(&ShimLibraryName, ImageName); - Status = LdrpLoadDll(FALSE, NULL, NULL, &ShimLibraryName, &ShimLibrary, TRUE); + /* We should NOT pass CallInit = TRUE! + If we do this, other init routines will be called before we get a chance to shim stuff.. */ + Status = LdrpLoadDll(FALSE, NULL, NULL, &ShimLibraryName, &ShimLibrary, FALSE); if (NT_SUCCESS(Status)) { g_pShimEngineModule = ShimLibrary; + LdrpRunShimEngineInitRoutine(DLL_PROCESS_ATTACH); LdrpGetShimEngineInterface(); if (g_ShimsEnabled) { @@ -2754,6 +2792,7 @@ LdrpUnloadShimEngine() { /* Make sure we do not call into the shim engine anymore */ g_ShimsEnabled = FALSE; + LdrpRunShimEngineInitRoutine(DLL_PROCESS_DETACH); LdrUnloadDll(g_pShimEngineModule); g_pShimEngineModule = NULL; }
