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

[AVRF] Hook up debug functions, add noisy stub for AVrfpGetStackTraceAddress

Browse source
This commit is contained in:
Mark Jansen 2020-04-11 14:21:24 +02:00
parent a7a504a466
commit 5821136dfa
5 changed files with 88 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dll/ntdll/ldr/ldrinit.c
View file

@ -1517,7 +1517,7 @@ LdrpInitializeExecutionOptions(PUNICODE_STRING ImagePathName, PPEB Peb, PHANDLE
/* Call AVRF if necessary */
if (Peb->NtGlobalFlag & (FLG_APPLICATION_VERIFIER | FLG_HEAP_PAGE_ALLOCS))
{
Status = LdrpInitializeApplicationVerifierPackage(KeyHandle, Peb, TRUE, FALSE);
Status = LdrpInitializeApplicationVerifierPackage(KeyHandle, Peb, FALSE, FALSE);
if (!NT_SUCCESS(Status))
{
DPRINT1("AVRF: LdrpInitializeApplicationVerifierPackage failed with %08X\n", Status);

78
dll/ntdll/ldr/verifier.c
View file

@ -3,7 +3,7 @@
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Verifier support routines
* COPYRIGHT: Copyright 2011 Aleksey Bragin (aleksey@reactos.org)
* Copyright 2018 Mark Jansen (mark.jansen@reactos.org)
* Copyright 2018-2025 Mark Jansen (mark.jansen@reactos.org)
*/
@ -13,6 +13,10 @@
#define NDEBUG
#include <debug.h>
/* heappage.c */
HANDLE NTAPI RtlpPageHeapCreate(ULONG Flags, PVOID Addr, SIZE_T TotalSize, SIZE_T CommitSize, PVOID Lock, PRTL_HEAP_PARAMETERS Parameters);
PVOID NTAPI RtlpPageHeapDestroy(HANDLE HeapPtr);
extern PLDR_DATA_TABLE_ENTRY LdrpImageEntry;
ULONG AVrfpVerifierFlags = 0;
WCHAR AVrfpVerifierDllsString[256] = { 0 };
@ -355,6 +359,31 @@ AVrfDllUnloadNotification(IN PLDR_DATA_TABLE_ENTRY LdrEntry)
RtlLeaveCriticalSection(&AVrfpVerifierLock);
}
VOID
NTAPI
AVrfInternalHeapFreeNotification(PVOID AllocationBase, SIZE_T AllocationSize)
{
PLIST_ENTRY Entry;
if (!(NtCurrentPeb()->NtGlobalFlag & FLG_APPLICATION_VERIFIER))
return;
RtlEnterCriticalSection(&AVrfpVerifierLock);
for (Entry = AVrfpVerifierProvidersList.Flink; Entry != &AVrfpVerifierProvidersList; Entry = Entry->Flink)
{
PVERIFIER_PROVIDER Provider;
RTL_VERIFIER_NTDLLHEAPFREE_CALLBACK ProviderHeapFreeCallback;
Provider = CONTAINING_RECORD(Entry, VERIFIER_PROVIDER, ListEntry);
ProviderHeapFreeCallback = Provider->ProviderNtdllHeapFreeCallback;
if (ProviderHeapFreeCallback)
{
ProviderHeapFreeCallback(AllocationBase, AllocationSize);
}
}
RtlLeaveCriticalSection(&AVrfpVerifierLock);
}
VOID
NTAPI
@ -480,13 +509,48 @@ AVrfpChainDuplicateThunks(VOID)
}
}
static
PVOID
NTAPI
AVrfpGetStackTraceAddress(ULONG Arg0)
{
UNIMPLEMENTED;
DbgBreakPoint();
return NULL;
}
static
HANDLE
NTAPI
AVrfpDebugPageHeapCreate(ULONG Flags,
PVOID Addr,
SIZE_T TotalSize,
SIZE_T CommitSize,
PVOID Lock,
PRTL_HEAP_PARAMETERS Parameters)
{
HANDLE hHeap;
hHeap = RtlpPageHeapCreate(Flags, Addr, TotalSize, CommitSize, Lock, Parameters);
DbgPrint("AVRF: DebugPageHeapCreate(Flags=%x, Addr=%p, TotalSize=%u, CommitSize=%u, Lock=%p, Parameters=%p) = %p\n",
Flags, Addr, TotalSize, CommitSize, Lock, Parameters, hHeap);
return hHeap;
}
static
PVOID
AVrfpDebugPageHeapDestroy(HANDLE HeapPtr)
{
DbgPrint("AVRF: DebugPageHeapDestroy(HeapPtr=%p)\n", HeapPtr);
return RtlpPageHeapDestroy(HeapPtr);
}
NTSTATUS
NTAPI
AVrfpLoadAndInitializeProvider(PVERIFIER_PROVIDER Provider)
{
WCHAR StringBuffer[MAX_PATH + 11];
UNICODE_STRING DllPath;
PRTL_VERIFIER_PROVIDER_DESCRIPTOR Descriptor;
PRTL_VERIFIER_PROVIDER_DESCRIPTOR Descriptor = NULL;
PIMAGE_NT_HEADERS ImageNtHeader;
NTSTATUS Status;
@ -544,13 +608,9 @@ AVrfpLoadAndInitializeProvider(PVERIFIER_PROVIDER Provider)
Descriptor->VerifierFlags = AVrfpVerifierFlags;
Descriptor->VerifierDebug = AVrfpDebug;
/* We don't have these yet */
DPRINT1("AVRF: RtlpGetStackTraceAddress MISSING\n");
DPRINT1("AVRF: RtlpDebugPageHeapCreate MISSING\n");
DPRINT1("AVRF: RtlpDebugPageHeapDestroy MISSING\n");
Descriptor->RtlpGetStackTraceAddress = NULL;
Descriptor->RtlpDebugPageHeapCreate = NULL;
Descriptor->RtlpDebugPageHeapDestroy = NULL;
Descriptor->RtlpGetStackTraceAddress = AVrfpGetStackTraceAddress;
Descriptor->RtlpDebugPageHeapCreate = AVrfpDebugPageHeapCreate;
Descriptor->RtlpDebugPageHeapDestroy = AVrfpDebugPageHeapDestroy;
Status = STATUS_SUCCESS;
}
else

5
modules/rostests/apitests/rtl/ldrstubs.c
View file

@ -15,3 +15,8 @@ LdrpInitializeProcessCompat(PVOID pProcessActctx, PVOID* pOldShimData)
{
}
VOID NTAPI
AVrfInternalHeapFreeNotification(PVOID AllocationBase, SIZE_T AllocationSize)
{
/* Stub for linking against rtl */
}

8
ntoskrnl/rtl/misc.c
View file

@ -222,4 +222,12 @@ RtlPrefetchMemoryNonTemporal(IN PVOID Source,
}
#endif
VOID NTAPI
AVrfInternalHeapFreeNotification(PVOID AllocationBase, SIZE_T AllocationSize)
{
/* Stub for linking against rtl */
}
/* EOF */

7
sdk/lib/rtl/heappage.c
View file

@ -202,6 +202,10 @@ RtlpDphReportCorruptedBlock(
BOOLEAN NTAPI
RtlpDphNormalHeapValidate(PDPH_HEAP_ROOT DphRoot, ULONG Flags, PVOID BaseAddress);
/* verifier.c */
VOID NTAPI
AVrfInternalHeapFreeNotification(PVOID AllocationBase, SIZE_T AllocationSize);
VOID NTAPI
RtlpDphRaiseException(NTSTATUS Status)
@ -1712,8 +1716,7 @@ RtlpPageHeapDestroy(HANDLE HeapPtr)
}
}
/* FIXME: Call AV notification */
//AVrfInternalHeapFreeNotification();
AVrfInternalHeapFreeNotification(Node->pUserAllocation, Node->nUserRequestedSize);
/* Go to the next node */
Ptr = RtlEnumerateGenericTableAvl(&DphRoot->BusyNodesTable, FALSE);