Skip to content

fix: remove unsafe exec() in TwinUIPatches.cpp #4940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
orbisai0security wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −4
Open

fix: remove unsafe exec() in TwinUIPatches.cpp #4940

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions ExplorerPatcher/TwinUIPatches.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1551,14 +1551,18 @@ BOOL Moment2PatchHardwareConfirmator(HMODULE hHardwareConfirmator, PBYTE pSearch
*(uintptr_t*)(memmem(shellcode, sizeof(shellcode), &pattern, sizeof(uintptr_t))) = (uintptr_t)HardwareConfirmatorShellcode;

// Execution
BYTE patch[sizeof(shellcode) + 5];
memcpy(patch, shellcode, sizeof(shellcode));
PBYTE jmpLoc = writeAt + sizeof(shellcode);
patch[sizeof(shellcode)] = 0xE9;
*(DWORD*)(patch + sizeof(shellcode) + 1) = (DWORD)(match2 - jmpLoc - 5);
DWORD dwOldProtect = 0;
SIZE_T totalSize = sizeof(shellcode) + 5;
SIZE_T bytesWritten = 0;
if (!VirtualProtect(writeAt, totalSize, PAGE_EXECUTE_READWRITE, &dwOldProtect)) return FALSE;
memcpy(writeAt, shellcode, sizeof(shellcode));
PBYTE jmpLoc = writeAt + sizeof(shellcode);
jmpLoc[0] = 0xE9;
*(DWORD*)(jmpLoc + 1) = (DWORD)(match2 - jmpLoc - 5);
WriteProcessMemory(GetCurrentProcess(), writeAt, patch, totalSize, &bytesWritten);
VirtualProtect(writeAt, totalSize, dwOldProtect, &dwOldProtect);
if (bytesWritten != totalSize) return FALSE;

if (cleanupBegin)
{
Expand Down