session fix

This commit is contained in:
donnaskiez 2024-06-22 00:22:11 +10:00
parent 9dd07ceae7
commit 08b059bee9
4 changed files with 34 additions and 29 deletions

View file

@ -11,8 +11,6 @@
#include <immintrin.h> #include <immintrin.h>
#include <bcrypt.h> #include <bcrypt.h>
#define XOR_ROTATION_AMT 13
FORCEINLINE FORCEINLINE
STATIC STATIC
UINT64 UINT64
@ -41,26 +39,6 @@ CryptXorKeyGenerate_uint64()
return CryptGenerateRandomKey64(&seed); return CryptGenerateRandomKey64(&seed);
} }
VOID
CryptEncryptPointer64(_Inout_ PUINT64 Pointer, _In_ UINT64 Key)
{
*Pointer = _rotl64(*Pointer ^ Key, XOR_ROTATION_AMT);
}
VOID
CryptDecryptPointer64(_Inout_ PUINT64 Pointer, _In_ UINT64 Key)
{
*Pointer = _rotr64(*Pointer, XOR_ROTATION_AMT) ^ Key;
}
UINT64
CryptDecryptPointerOutOfPlace64(_In_ PUINT64 Pointer, _In_ UINT64 Key)
{
volatile UINT64 temp = *Pointer;
CryptDecryptPointer64(&temp, Key);
return temp;
}
VOID VOID
CryptEncryptImportsArray(_In_ PUINT64 Array, _In_ UINT32 Entries) CryptEncryptImportsArray(_In_ PUINT64 Array, _In_ UINT32 Entries)
{ {

View file

@ -3,7 +3,30 @@
#include "common.h" #include "common.h"
#define XOR_ROTATION_AMT 13
FORCEINLINE
VOID
CryptEncryptPointer64(_Inout_ PUINT64 Pointer, _In_ UINT64 Key)
{
*Pointer = _rotl64(*Pointer ^ Key, XOR_ROTATION_AMT);
}
FORCEINLINE
VOID
CryptDecryptPointer64(_Inout_ PUINT64 Pointer, _In_ UINT64 Key)
{
*Pointer = _rotr64(*Pointer, XOR_ROTATION_AMT) ^ Key;
}
FORCEINLINE
UINT64
CryptDecryptPointerOutOfPlace64(_In_ PUINT64 Pointer, _In_ UINT64 Key)
{
volatile UINT64 temp = *Pointer;
CryptDecryptPointer64(&temp, Key);
return temp;
}
VOID VOID
CryptEncryptImportsArray(_In_ PUINT64 Array, _In_ UINT32 Entries); CryptEncryptImportsArray(_In_ PUINT64 Array, _In_ UINT32 Entries);

View file

@ -1179,9 +1179,12 @@ DeviceClose(_In_ PDEVICE_OBJECT DeviceObject, _Inout_ PIRP Irp)
/* This needs to be fixed lol, cos anyone can just open a handle whhich /* This needs to be fixed lol, cos anyone can just open a handle whhich
* might not begin a session.*/ * might not begin a session.*/
SessionTerminate();
UnregisterProcessObCallbacks(); if (GetActiveSession()->is_session_active) {
SharedMappingTerminate(); SessionTerminate();
UnregisterProcessObCallbacks();
SharedMappingTerminate();
}
IoCompleteRequest(Irp, IO_NO_INCREMENT); IoCompleteRequest(Irp, IO_NO_INCREMENT);
return Irp->IoStatus.Status; return Irp->IoStatus.Status;

View file

@ -148,10 +148,9 @@ SessionInitialise(_In_ PIRP Irp)
goto end; goto end;
} }
session->km_handle = ImpPsGetProcessId(process); session->km_handle = ImpPsGetProcessId(process);
session->process = process; session->process = process;
session->is_session_active = TRUE; session->cookie = initiation->cookie;
session->cookie = initiation->cookie;
RtlCopyMemory(session->aes_key, initiation->aes_key, AES_256_KEY_SIZE); RtlCopyMemory(session->aes_key, initiation->aes_key, AES_256_KEY_SIZE);
RtlCopyMemory(session->iv, initiation->aes_iv, AES_256_IV_SIZE); RtlCopyMemory(session->iv, initiation->aes_iv, AES_256_IV_SIZE);
@ -182,6 +181,8 @@ SessionInitialise(_In_ PIRP Irp)
FindOurUserModeModuleEntry(HashOurUserModuleOnEntryCallback, session); FindOurUserModeModuleEntry(HashOurUserModuleOnEntryCallback, session);
session->is_session_active = TRUE;
end: end:
KeReleaseGuardedMutex(&session->lock); KeReleaseGuardedMutex(&session->lock);
return status; return status;