Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1615752: Require 10-byte detour for Win 8.0 x64 CreateFileA and DuplicateHandle r=aklotz

Browse Source 
In the current Win 8.0, these functions both start with a RIP-relative JMP (6 bytes) followed by 6 nops (6-bytes), which does not give us the 13-bytes we need for a trampoline so we require the trampoline to fit into 10 bytes.

Differential Revision: https://phabricator.services.mozilla.com/D63260

--HG--
extra : moz-landing-system : lando
This commit is contained in:
David Parks 2020-03-03 19:23:53 +00:00
parent 427ae6c5f6
commit d7f1ab7118
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mozglue/misc/nsWindowsDllInterceptor.h
View File

@ -430,13 +430,23 @@ class WindowsDllInterceptor final
// injected DLLs do the same and interfere with our stuff.
bool needs10BytePatch = (mModule == ::GetModuleHandleW(L"ntdll.dll"));
// CloseHandle on Windows 8 only accomodates 10-byte patches.
bool isWin8Or81 = IsWin8OrLater() && (!IsWin10OrLater());
needs10BytePatch |= isWin8Or81 &&
(mModule == ::GetModuleHandleW(L"kernel32.dll")) &&
bool isWin8 = IsWin8OrLater() && (!IsWin8Point1OrLater());
bool isKernel32Dll = (mModule == ::GetModuleHandleW(L"kernel32.dll"));
// CloseHandle on Windows 8/8.1 only accomodates 10-byte patches.
needs10BytePatch |= isWin8Or81 && isKernel32Dll &&
(reinterpret_cast<void*>(aProc) ==
reinterpret_cast<void*>(&CloseHandle));
// CreateFileA and DuplicateHandle on Windows 8 require 10-byte patches.
needs10BytePatch |= isWin8 && isKernel32Dll &&
((reinterpret_cast<void*>(aProc) ==
reinterpret_cast<void*>(&::CreateFileA)) ||
(reinterpret_cast<void*>(aProc) ==
reinterpret_cast<void*>(&::DuplicateHandle)));
if (needs10BytePatch) {
flags |= DetourFlags::eEnable10BytePatch;
}