Skip to content

Fix page protection restoration on update failures #382

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
RatinCN wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix page protection restoration on update failures #382

Show file tree
Hide file tree
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
37 changes: 28 additions & 9 deletions src/creatwth.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,15 +591,18 @@ static BOOL UpdateFrom32To64(HANDLE hProcess, HMODULE hModule, WORD machine,
/////////////////////////////////////////////////////// Write new headers.
//
DWORD dwProtect = 0;
DWORD dwOld = 0;
DWORD dwLastError = 0;
if (!DetourVirtualProtectSameExecuteEx(hProcess, pbModule, inh64.OptionalHeader.SizeOfHeaders,
PAGE_EXECUTE_READWRITE, &dwProtect)) {
return FALSE;
}

if (!WriteProcessMemory(hProcess, pnh, &inh64, sizeof(inh64), NULL)) {
dwLastError = GetLastError();
DETOUR_TRACE(("WriteProcessMemory(inh@%p..%p) failed: %lu\n",
pnh, pnh + sizeof(inh64), GetLastError()));
return FALSE;
pnh, pnh + sizeof(inh64), dwLastError));
goto restore;
}
DETOUR_TRACE(("WriteProcessMemory(inh@%p..%p)\n", pnh, pnh + sizeof(inh64)));

Expand All @@ -608,15 +611,17 @@ static BOOL UpdateFrom32To64(HANDLE hProcess, HMODULE hModule, WORD machine,
inh64.FileHeader.SizeOfOptionalHeader;
cb = inh64.FileHeader.NumberOfSections * sizeof(IMAGE_SECTION_HEADER);
if (!WriteProcessMemory(hProcess, psects, &sects, cb, NULL)) {
dwLastError = GetLastError();
DETOUR_TRACE(("WriteProcessMemory(ish@%p..%p) failed: %lu\n",
psects, psects + cb, GetLastError()));
return FALSE;
psects, psects + cb, dwLastError));
goto restore;
}
DETOUR_TRACE(("WriteProcessMemory(ish@%p..%p)\n", psects, psects + cb));

// Record the updated headers.
if (!RecordExeRestore(hProcess, hModule, der)) {
return FALSE;
dwLastError = GetLastError();
goto restore;
}

// Remove the import table.
Expand All @@ -625,19 +630,27 @@ static BOOL UpdateFrom32To64(HANDLE hProcess, HMODULE hModule, WORD machine,
inh64.IMPORT_DIRECTORY.Size = 0;

if (!WriteProcessMemory(hProcess, pnh, &inh64, sizeof(inh64), NULL)) {
dwLastError = GetLastError();
DETOUR_TRACE(("WriteProcessMemory(inh@%p..%p) failed: %lu\n",
pnh, pnh + sizeof(inh64), GetLastError()));
return FALSE;
pnh, pnh + sizeof(inh64), dwLastError));
goto restore;
}
}

DWORD dwOld = 0;
if (!VirtualProtectEx(hProcess, pbModule, inh64.OptionalHeader.SizeOfHeaders,
dwProtect, &dwOld)) {
return FALSE;
}

return TRUE;

restore:
if (!VirtualProtectEx(hProcess, pbModule, inh64.OptionalHeader.SizeOfHeaders,
dwProtect, &dwOld)) {
DETOUR_TRACE(("VirtualProtectEx(inh) restore failed: %lu\n", GetLastError()));
}
SetLastError(dwLastError);
return FALSE;
}
#endif // DETOURS_64BIT

Expand Down Expand Up @@ -864,7 +877,13 @@ BOOL WINAPI DetourUpdateProcessWithDllEx(_In_ HANDLE hProcess,
}

if (!WriteProcessMemory(hProcess, der.pclr, &clr, sizeof(clr), NULL)) {
DETOUR_TRACE(("WriteProcessMemory(clr) failed: %lu\n", GetLastError()));
DWORD dwLastError = GetLastError();
DETOUR_TRACE(("WriteProcessMemory(clr) failed: %lu\n", dwLastError));
DWORD dwOld = 0;
if (!VirtualProtectEx(hProcess, der.pclr, sizeof(clr), dwProtect, &dwOld)) {
DETOUR_TRACE(("VirtualProtectEx(clr) restore failed: %lu\n", GetLastError()));
}
SetLastError(dwLastError);
return FALSE;
}

Expand Down
20 changes: 16 additions & 4 deletions src/uimports.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,8 @@ static BOOL UPDATE_IMPORTS_XX(HANDLE hProcess,

DWORD obBase = (DWORD)(pbNewIid - pbModule);
DWORD dwProtect = 0;
DWORD dwOld = 0;
DWORD dwLastError = 0;

if (inh.IMPORT_DIRECTORY.VirtualAddress != 0) {
// Read the old import directory if it exists.
Expand Down Expand Up @@ -309,14 +311,16 @@ static BOOL UPDATE_IMPORTS_XX(HANDLE hProcess,
inh.OptionalHeader.CheckSum = 0;

if (!WriteProcessMemory(hProcess, pbModule, &idh, sizeof(idh), NULL)) {
DETOUR_TRACE(("WriteProcessMemory(idh) failed: %lu\n", GetLastError()));
goto finish;
dwLastError = GetLastError();
DETOUR_TRACE(("WriteProcessMemory(idh) failed: %lu\n", dwLastError));
goto restore;
}
DETOUR_TRACE(("WriteProcessMemory(idh:%p..%p)\n", pbModule, pbModule + sizeof(idh)));

if (!WriteProcessMemory(hProcess, pbModule + idh.e_lfanew, &inh, sizeof(inh), NULL)) {
DETOUR_TRACE(("WriteProcessMemory(inh) failed: %lu\n", GetLastError()));
goto finish;
dwLastError = GetLastError();
DETOUR_TRACE(("WriteProcessMemory(inh) failed: %lu\n", dwLastError));
goto restore;
}
DETOUR_TRACE(("WriteProcessMemory(inh:%p..%p)\n",
pbModule + idh.e_lfanew,
Expand All @@ -330,4 +334,12 @@ static BOOL UPDATE_IMPORTS_XX(HANDLE hProcess,

fSucceeded = TRUE;
goto finish;

restore:
if (!VirtualProtectEx(hProcess, pbModule, inh.OptionalHeader.SizeOfHeaders,
dwProtect, &dwOld)) {
DETOUR_TRACE(("VirtualProtectEx(idh) restore failed: %lu\n", GetLastError()));
}
SetLastError(dwLastError);
goto finish;
}