admin/bb107-MemoryModulePP
1
0
Fork 0
mirror of https://github.com/bb107/MemoryModulePP synced 2026-06-08 13:15:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed a bug when processing tls

Browse Source
This commit is contained in:
Boring
2023-03-18 21:50:04 +08:00
parent b72afcf6dd
commit 9e9fd2ab94
10 changed files with 295 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MemoryModule/MmpTls.cpp
+18 -4
View File
@@ -454,7 +454,7 @@ BOOL NTAPI PreHookNtSetInformationProcess() {
}
NTSTATUS NTAPI HookNtSetInformationProcess(
_In_ HANDLE ProcessHandle,
_In_opt_ HANDLE ProcessHandle,
_In_ PROCESSINFOCLASS ProcessInformationClass,
_In_reads_bytes_(ProcessInformationLength) PVOID ProcessInformation,
_In_ ULONG ProcessInformationLength) {
@@ -468,7 +468,6 @@ NTSTATUS NTAPI HookNtSetInformationProcess(
);
}
auto ProcessTlsInformation = PPROCESS_TLS_INFORMATION(ProcessInformation);
auto hProcess = ProcessHandle ? ProcessHandle : NtCurrentProcess();
auto TlsLength = ProcessInformationLength;
@@ -556,9 +555,12 @@ NTSTATUS NTAPI HookNtSetInformationProcess(
PMMP_TLSP_RECORD j = CONTAINING_RECORD(entry, MMP_TLSP_RECORD, InMmpThreadLocalStoragePointer);
if (ProcessTlsInformation->OperationType == ProcessTlsReplaceVector) {
if (j->TlspMmpBlock[ProcessTlsInformation->TlsVectorLength] == ProcessTlsInformation->ThreadData->TlsVector[ProcessTlsInformation->TlsVectorLength]) {
if (j->TlspMmpBlock[ProcessTlsInformation->TlsVectorLength] == ProcessTlsInformation->ThreadData[i].TlsVector[ProcessTlsInformation->TlsVectorLength]) {
found = true;
//auto tlsp = CONTAINING_RECORD(ProcessTlsInformation->ThreadData[i].TlsVector, TLS_VECTOR, TLS_VECTOR::ModuleTlsData);
//assert(tlsp->Length >= ProcessTlsInformation->TlsVectorLength);
// Copy old data to new pointer
RtlCopyMemory(
ProcessTlsInformation->ThreadData[i].TlsVector,
@@ -767,17 +769,29 @@ NTSTATUS NTAPI MmpHandleTlsData(_In_ PLDR_DATA_TABLE_ENTRY lpModuleEntry) {
return STATUS_NO_MEMORY;
}
status = NtSetInformationProcess(
status = HookNtSetInformationProcess(
nullptr, // hack
PROCESSINFOCLASS::ProcessTlsInformation,
ProcessTlsInformation,
(ULONG)Length
);
ThreadCount = 0;
for (DWORD i = 0; i < ProcessTlsInformation->ThreadDataCount; ++i) {
if (!ProcessTlsInformation->ThreadData[i].Flags) {
++ThreadCount;
}
RtlFreeHeap(RtlProcessHeap(), 0, ProcessTlsInformation->ThreadData[i].TlsModulePointer);
}
if (ThreadCount) {
EnterCriticalSection(&MmpGlobalDataPtr->MmpTls->MmpTlspLock);
MmpGlobalDataPtr->MmpTls->MmpActiveThreadCount -= ThreadCount;
assert(MmpGlobalDataPtr->MmpTls->MmpActiveThreadCount > 0);
LeaveCriticalSection(&MmpGlobalDataPtr->MmpTls->MmpTlspLock);
}
RtlFreeHeap(RtlProcessHeap(), 0, ProcessTlsInformation);
return status;
}