From 59e06ca5afa859e99e5f8d31378b42252cd2e321 Mon Sep 17 00:00:00 2001 From: Boring <1079299053@qq.com> Date: Fri, 31 Mar 2023 08:03:22 +0800 Subject: [PATCH] Fixed some code formatting --- MemoryModule/MemoryModule.cpp | 2 +- MemoryModule/MmpTls.cpp | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/MemoryModule/MemoryModule.cpp b/MemoryModule/MemoryModule.cpp index 8a0228c..65f6dca 100644 --- a/MemoryModule/MemoryModule.cpp +++ b/MemoryModule/MemoryModule.cpp @@ -248,7 +248,7 @@ NTSTATUS MemoryLoadLibrary( nullptr, old_header->OptionalHeader.SizeOfImage, MEM_RESERVE, - PAGE_READWRITE + PAGE_EXECUTE_READWRITE ); if (!base) status = STATUS_NO_MEMORY; } diff --git a/MemoryModule/MmpTls.cpp b/MemoryModule/MmpTls.cpp index cfb529d..4f1960b 100644 --- a/MemoryModule/MmpTls.cpp +++ b/MemoryModule/MmpTls.cpp @@ -540,13 +540,14 @@ NTSTATUS NTAPI HookNtSetInformationProcess( TlsLength ); + if (!NT_SUCCESS(status))break; + // // Modify our mapping // EnterCriticalSection(&MmpGlobalDataPtr->MmpTls->MmpTlspLock); for (ULONG i = 0; i < Tls->ThreadDataCount; ++i) { - - bool found = false; + BOOL found = FALSE; PLIST_ENTRY entry = MmpGlobalDataPtr->MmpTls->MmpThreadLocalStoragePointer.Flink; // Find thread-spec tlsp @@ -556,10 +557,7 @@ NTSTATUS NTAPI HookNtSetInformationProcess( if (ProcessTlsInformation->OperationType == ProcessTlsReplaceVector) { 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); + found = TRUE; // Copy old data to new pointer RtlCopyMemory( @@ -577,7 +575,7 @@ NTSTATUS NTAPI HookNtSetInformationProcess( } else { if (j->TlspMmpBlock[ProcessTlsInformation->TlsIndex] == ProcessTlsInformation->ThreadData[i].TlsModulePointer) { - found = true; + found = TRUE; if (ProcessHandle) { j->TlspLdrBlock[ProcessTlsInformation->TlsIndex] = ProcessTlsInformation->ThreadData[i].TlsModulePointer;