Skip to content

Commit

Permalink
Version 4.15
Browse files Browse the repository at this point in the history
  • Loading branch information
@ufrisk
ufrisk committed Aug 4, 2022
1 parent 05433c3 commit 1b4dbcf
Show file tree
Hide file tree
Showing 14 changed files with 592 additions and 320 deletions.
Binary file modified includes/lib64/leechcore.lib
View file
Binary file not shown.
Binary file modified includes/lib64/vmm.lib
View file
Binary file not shown.
679 changes: 471 additions & 208 deletions includes/vmmdll.h
View file

Large diffs are not rendered by default.

34 changes: 21 additions & 13 deletions pcileech/charutil.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -766,6 +766,7 @@ DWORD CharUtil_FixFsNameU(_Out_writes_(cbuDst) LPSTR uszDst, _In_ DWORD cbuDst,
* characters with '_'. Also optionally add a suffix between 1-9 and fix
* upper-case letters. One of [usz, sz, wsz] must be valid.
* -- uszOut
* -- cbuDst
* -- usz
* -- sz
* -- wsz
Expand All @@ -776,17 +777,18 @@ DWORD CharUtil_FixFsNameU(_Out_writes_(cbuDst) LPSTR uszDst, _In_ DWORD cbuDst,
* -- return = number of bytes written (including terminating NULL).
*/
_Success_(return != 0)
DWORD CharUtil_FixFsName(_Out_writes_(2*MAX_PATH) LPSTR uszOut, _In_opt_ LPCSTR usz, _In_opt_ LPCSTR sz, _In_opt_ LPCWSTR wsz, _In_ DWORD cch, _In_opt_ DWORD iSuffix, _In_ BOOL fUpper)
DWORD CharUtil_FixFsName(_Out_writes_(cbuDst) LPSTR uszOut, _In_ DWORD cbuDst, _In_opt_ LPCSTR usz, _In_opt_ LPCSTR sz, _In_opt_ LPCWSTR wsz, _In_ DWORD cch, _In_opt_ DWORD iSuffix, _In_ BOOL fUpper)
{
UCHAR c;
DWORD i = 0;
LPSTR uszTMP;
uszOut[0] = 0;
// 1: convert correct size utf-8
if(cbuDst < 5) { return 0; }
if(!sz && !usz && !wsz) { return 0; }
if(sz && !CharUtil_AtoU((LPSTR)sz, cch, (PBYTE)uszOut, 2 * MAX_PATH - 3, &uszTMP, NULL, CHARUTIL_FLAG_TRUNCATE)) { return 0; }
if(wsz && !CharUtil_WtoU((LPWSTR)wsz, cch, (PBYTE)uszOut, 2 * MAX_PATH - 3, &uszTMP, NULL, CHARUTIL_FLAG_TRUNCATE)) { return 0; }
if(usz && !CharUtil_UtoU((LPSTR)usz, cch, (PBYTE)uszOut, 2 * MAX_PATH - 3, &uszTMP, NULL, CHARUTIL_FLAG_TRUNCATE)) { return 0; }
if(sz && !CharUtil_AtoU((LPSTR)sz, cch, (PBYTE)uszOut, cbuDst - 4, &uszTMP, NULL, CHARUTIL_FLAG_TRUNCATE)) { return 0; }
if(wsz && !CharUtil_WtoU((LPWSTR)wsz, cch, (PBYTE)uszOut, cbuDst - 4, &uszTMP, NULL, CHARUTIL_FLAG_TRUNCATE)) { return 0; }
if(usz && !CharUtil_UtoU((LPSTR)usz, cch, (PBYTE)uszOut, cbuDst - 4, &uszTMP, NULL, CHARUTIL_FLAG_TRUNCATE)) { return 0; }
// 2: replace bad/uppercase chars
if(fUpper) {
while((c = uszOut[i])) {
Expand Down Expand Up @@ -826,10 +828,11 @@ DWORD CharUtil_FixFsName(_Out_writes_(2*MAX_PATH) LPSTR uszOut, _In_opt_ LPCSTR
* -- fUpper
* -- return
*/
QWORD CharUtil_Hash64U(_In_ LPCSTR usz, _In_ BOOL fUpper)
QWORD CharUtil_Hash64U(_In_opt_ LPCSTR usz, _In_ BOOL fUpper)
{
CHAR c;
QWORD i = 0, qwHash = 0;
if(!usz) { return 0; }
if(fUpper) {
while(TRUE) {
c = usz[i++];
Expand All @@ -848,11 +851,12 @@ QWORD CharUtil_Hash64U(_In_ LPCSTR usz, _In_ BOOL fUpper)
}
}

QWORD CharUtil_Hash64A(_In_ LPCSTR sz, _In_ BOOL fUpper)
QWORD CharUtil_Hash64A(_In_opt_ LPCSTR sz, _In_ BOOL fUpper)
{
LPSTR usz;
QWORD qwHash = 0;
BYTE pbBuffer[MAX_PATH];
if(!sz) { return 0; }
if(CharUtil_IsAnsiA(sz)) {
return CharUtil_Hash64U(sz, fUpper);
}
Expand All @@ -863,13 +867,14 @@ QWORD CharUtil_Hash64A(_In_ LPCSTR sz, _In_ BOOL fUpper)
return qwHash;
}

QWORD CharUtil_Hash64W(_In_ LPCWSTR wsz, _In_ BOOL fUpper)
QWORD CharUtil_Hash64W(_In_opt_ LPCWSTR wsz, _In_ BOOL fUpper)
{
CHAR c;
LPSTR usz;
QWORD i = 0, qwHash = 0;
BYTE pbBuffer[MAX_PATH];
PUSHORT pus = (PUSHORT)wsz;
if(!wsz) { return 0; }
if(CharUtil_IsAnsiW(wsz)) {
while(TRUE) {
c = (CHAR)pus[i++];
Expand All @@ -887,10 +892,11 @@ QWORD CharUtil_Hash64W(_In_ LPCWSTR wsz, _In_ BOOL fUpper)
return qwHash;
}

DWORD CharUtil_Hash32U(_In_ LPCSTR usz, _In_ BOOL fUpper)
DWORD CharUtil_Hash32U(_In_opt_ LPCSTR usz, _In_ BOOL fUpper)
{
CHAR c;
DWORD i = 0, dwHash = 0;
if(!usz) { return 0; }
if(fUpper) {
while(TRUE) {
c = usz[i++];
Expand All @@ -909,11 +915,12 @@ DWORD CharUtil_Hash32U(_In_ LPCSTR usz, _In_ BOOL fUpper)
}
}

DWORD CharUtil_Hash32A(_In_ LPCSTR sz, _In_ BOOL fUpper)
DWORD CharUtil_Hash32A(_In_opt_ LPCSTR sz, _In_ BOOL fUpper)
{
LPSTR usz;
DWORD dwHash = 0;
BYTE pbBuffer[MAX_PATH];
if(!sz) { return 0; }
if(CharUtil_IsAnsiA(sz)) {
return CharUtil_Hash32U(sz, fUpper);
}
Expand All @@ -924,13 +931,14 @@ DWORD CharUtil_Hash32A(_In_ LPCSTR sz, _In_ BOOL fUpper)
return dwHash;
}

DWORD CharUtil_Hash32W(_In_ LPCWSTR wsz, _In_ BOOL fUpper)
DWORD CharUtil_Hash32W(_In_opt_ LPCWSTR wsz, _In_ BOOL fUpper)
{
CHAR c;
LPSTR usz;
DWORD i = 0, dwHash = 0;
BYTE pbBuffer[MAX_PATH];
PUSHORT pus = (PUSHORT)wsz;
if(!wsz) { return 0; }
if(CharUtil_IsAnsiW(wsz)) {
while(TRUE) {
c = (CHAR)pus[i++];
Expand Down Expand Up @@ -974,21 +982,21 @@ DWORD CharUtil_Internal_HashFs(_In_ LPSTR usz)
DWORD CharUtil_HashNameFsU(_In_ LPCSTR usz, _In_opt_ DWORD iSuffix)
{
CHAR uszFs[2*MAX_PATH];
if(!CharUtil_FixFsName(uszFs, usz, NULL, NULL, -1, iSuffix, TRUE)) { return 0; }
if(!CharUtil_FixFsName(uszFs, sizeof(uszFs), usz, NULL, NULL, -1, iSuffix, TRUE)) { return 0; }
return CharUtil_Internal_HashFs(uszFs);
}

DWORD CharUtil_HashNameFsA(_In_ LPCSTR sz, _In_opt_ DWORD iSuffix)
{
CHAR uszFs[2 * MAX_PATH];
if(!CharUtil_FixFsName(uszFs, NULL, sz, NULL, -1, iSuffix, TRUE)) { return 0; }
if(!CharUtil_FixFsName(uszFs, sizeof(uszFs), NULL, sz, NULL, -1, iSuffix, TRUE)) { return 0; }
return CharUtil_Internal_HashFs(uszFs);
}

DWORD CharUtil_HashNameFsW(_In_ LPCWSTR wsz, _In_opt_ DWORD iSuffix)
{
CHAR uszFs[2 * MAX_PATH];
if(!CharUtil_FixFsName(uszFs, NULL, NULL, wsz, -1, iSuffix, TRUE)) { return 0; }
if(!CharUtil_FixFsName(uszFs, sizeof(uszFs), NULL, NULL, wsz, -1, iSuffix, TRUE)) { return 0; }
return CharUtil_Internal_HashFs(uszFs);
}

Expand Down
16 changes: 9 additions & 7 deletions pcileech/charutil.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,12 +166,12 @@ BOOL CharUtil_WtoJ(
* -- fUpper
* -- return
*/
DWORD CharUtil_Hash32U(_In_ LPCSTR usz, _In_ BOOL fUpper);
DWORD CharUtil_Hash32A(_In_ LPCSTR sz, _In_ BOOL fUpper);
DWORD CharUtil_Hash32W(_In_ LPCWSTR wsz, _In_ BOOL fUpper);
QWORD CharUtil_Hash64U(_In_ LPCSTR usz, _In_ BOOL fUpper);
QWORD CharUtil_Hash64A(_In_ LPCSTR sz, _In_ BOOL fUpper);
QWORD CharUtil_Hash64W(_In_ LPCWSTR wsz, _In_ BOOL fUpper);
DWORD CharUtil_Hash32U(_In_opt_ LPCSTR usz, _In_ BOOL fUpper);
DWORD CharUtil_Hash32A(_In_opt_ LPCSTR sz, _In_ BOOL fUpper);
DWORD CharUtil_Hash32W(_In_opt_ LPCWSTR wsz, _In_ BOOL fUpper);
QWORD CharUtil_Hash64U(_In_opt_ LPCSTR usz, _In_ BOOL fUpper);
QWORD CharUtil_Hash64A(_In_opt_ LPCSTR sz, _In_ BOOL fUpper);
QWORD CharUtil_Hash64W(_In_opt_ LPCWSTR wsz, _In_ BOOL fUpper);

/*
* Hash a name string in a way that is supported by the file system.
Expand Down Expand Up @@ -220,6 +220,7 @@ DWORD CharUtil_FixFsNameU(
* characters with '_'. Also optionally add a suffix between 1-9 and fix
* upper-case letters. One of [usz, sz, wsz] must be valid.
* -- uszOut
* -- cbuDst
* -- usz
* -- sz
* -- wsz
Expand All @@ -231,7 +232,8 @@ DWORD CharUtil_FixFsNameU(
*/
_Success_(return != 0)
DWORD CharUtil_FixFsName(
_Out_writes_(2*MAX_PATH) LPSTR uszOut,
_Out_writes_(cbuDst) LPSTR uszOut,
_In_ DWORD cbuDst,
_In_opt_ LPCSTR usz,
_In_opt_ LPCSTR sz,
_In_opt_ LPCWSTR wsz,
Expand Down
6 changes: 3 additions & 3 deletions pcileech/executor.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ BOOL Exec_ConsoleRedirect_Initialize(_In_ QWORD ConsoleBufferAddr_InputStream, _
pd->pInfoOS = (PEXEC_IO)pd->pbDataOSConsoleBuffer;
// read initial buffer and check validity
result = dwPID ?
VMMDLL_MemReadEx(dwPID, ConsoleBufferAddr_OutputStream, pd->pbDataOSConsoleBuffer, 0x1000, NULL, VMMDLL_FLAG_NOCACHE) :
VMMDLL_MemReadEx(ctxMain->hVMM, dwPID, ConsoleBufferAddr_OutputStream, pd->pbDataOSConsoleBuffer, 0x1000, NULL, VMMDLL_FLAG_NOCACHE) :
DeviceReadMEM(ConsoleBufferAddr_OutputStream, 0x1000, pd->pbDataOSConsoleBuffer, FALSE);
if(!result || (pd->pInfoOS->magic != EXEC_IO_MAGIC)) {
return FALSE;
Expand Down Expand Up @@ -124,14 +124,14 @@ VOID Exec_ConsoleRedirect(_In_ QWORD ConsoleBufferAddr_InputStream, _In_ QWORD C
while(TRUE) {
SwitchToThread();
result = dwPID ?
VMMDLL_MemReadEx(dwPID, ConsoleBufferAddr_OutputStream, pd->pbDataOSConsoleBuffer, 0x1000, NULL, VMMDLL_FLAG_NOCACHE) :
VMMDLL_MemReadEx(ctxMain->hVMM, dwPID, ConsoleBufferAddr_OutputStream, pd->pbDataOSConsoleBuffer, 0x1000, NULL, VMMDLL_FLAG_NOCACHE) :
DeviceReadMEM(ConsoleBufferAddr_OutputStream, 0x1000, pd->pbDataOSConsoleBuffer, FALSE);
if(!result || pd->pInfoOS->magic != EXEC_IO_MAGIC) {
printf("\nCONSOLE_REDIRECT: Error: Address 0x%016llX does not\ncontain a valid console buffer.\n", ConsoleBufferAddr_OutputStream);
goto fail;
}
if(dwPID) {
VMMDLL_MemWrite(dwPID, ConsoleBufferAddr_InputStream, pd->pbDataISConsoleBuffer, 0x1000);
VMMDLL_MemWrite(ctxMain->hVMM, dwPID, ConsoleBufferAddr_InputStream, pd->pbDataISConsoleBuffer, 0x1000);
} else {
DeviceWriteMEM(ConsoleBufferAddr_InputStream, 0x1000, pd->pbDataISConsoleBuffer, FALSE);
}
Expand Down
Loading

0 comments on commit 1b4dbcf

Please sign in to comment.