This is an archive of the discontinued LLVM Phabricator instance.

[asan] Fix interception unittest on Windows64.
ClosedPublic

Authored by wang0109 on Jul 12 2016, 12:18 PM.

Reviewers

Commits

Summary

mov edi,edi is _not_ NOP in 64-bit, use 66,90h instead.
This bug was causing interception unittest to crash on Windows64.

Credits to etienneb for finding the root cause.

wang0109 retitled this revision from to [asan] Fix interception unittest on Windows64..

wang0109 updated this object.

lgtm

lgtm

This revision is now accepted and ready to land.Jul 12 2016, 12:43 PM

This revision was automatically updated to reflect the committed changes.

Path

Size

lib/

interception/

1 line

tests/

10 lines

Show First 20 Lines • Show All 455 Lines • ▼ Show 20 Lines	switch ((u16)address) {
case 0x5440: // push rsp		case 0x5440: // push rsp
case 0x5540: // push rbp		case 0x5540: // push rbp
case 0x5640: // push rsi		case 0x5640: // push rsi
case 0x5740: // push rdi		case 0x5740: // push rdi
case 0x5441: // push r12		case 0x5441: // push r12
case 0x5541: // push r13		case 0x5541: // push r13
case 0x5641: // push r14		case 0x5641: // push r14
case 0x5741: // push r15		case 0x5741: // push r15
		case 0x9066: // Two-byte NOP
return 2;		return 2;
}		}

switch (0x00FFFFFF & (u32)address) {		switch (0x00FFFFFF & (u32)address) {
case 0xe58948: // 48 8b c4 : mov rbp, rsp		case 0xe58948: // 48 8b c4 : mov rbp, rsp
case 0xc18b48: // 48 8b c1 : mov rax, rcx		case 0xc18b48: // 48 8b c1 : mov rax, rcx
case 0xc48b48: // 48 8b c4 : mov rax, rsp		case 0xc48b48: // 48 8b c4 : mov rax, rsp
case 0xd9f748: // 48 f7 d9 : neg rcx		case 0xd9f748: // 48 f7 d9 : neg rcx
▲ Show 20 Lines • Show All 434 Lines • Show Last 20 Lines

Show First 20 Lines • Show All 228 Lines • ▼ Show 20 Lines	static void LoadActiveCode(
for (size_t i = 0; i < padding; ++i)		for (size_t i = 0; i < padding; ++i)
ActiveCode[position++] = 0x90;		ActiveCode[position++] = 0x90;

// Keep track of the entry point.		// Keep track of the entry point.
*entry_point = (uptr)&ActiveCode[position];		*entry_point = (uptr)&ActiveCode[position];

// Add the detour instruction (i.e. mov edi, edi)		// Add the detour instruction (i.e. mov edi, edi)
if (prefix_kind == FunctionPrefixDetour) {		if (prefix_kind == FunctionPrefixDetour) {
		#if SANITIZER_WINDOWS64
		// Note that "mov edi,edi" is NOP in 32-bit only, in 64-bit it clears
		// higher bits of RDI.
		// Use 66,90H as NOP for Windows64.
		ActiveCode[position++] = 0x66;
		ActiveCode[position++] = 0x90;
		#else
		// mov edi,edi.
ActiveCode[position++] = 0x8B;		ActiveCode[position++] = 0x8B;
ActiveCode[position++] = 0xFF;		ActiveCode[position++] = 0xFF;
		#endif

}		}

// Copy the function body.		// Copy the function body.
for (size_t i = 0; i < sizeof(T); ++i)		for (size_t i = 0; i < sizeof(T); ++i)
ActiveCode[position++] = code[i];		ActiveCode[position++] = code[i];
}		}

int InterceptorFunctionCalled;		int InterceptorFunctionCalled;
▲ Show 20 Lines • Show All 336 Lines • Show Last 20 Lines