Skip to content

Commit

Permalink
[compiler-rt] Enhance function padding detection for function interce…
Browse files Browse the repository at this point in the history
…ption

Summary:
Many CRT (64-bits) functions contains a "hint-nop". The current padding
detection is not able to recognize the 10-bytes padding and the HotPatch
hooking technique cannot be used.

Other patterns may be discover and may be added later.

Reviewers: rnk

Subscribers: llvm-commits, wang0109, chrisha

Differential Revision: http://reviews.llvm.org/D22258

llvm-svn: 275180
  • Loading branch information
bergeret committed Jul 12, 2016
1 parent 2d84ec6 commit 9c2a220
Showing 1 changed file with 24 additions and 1 deletion.
25 changes: 24 additions & 1 deletion compiler-rt/lib/interception/interception_win.cc
Expand Up @@ -202,6 +202,29 @@ static bool IsMemoryPadding(uptr address, uptr size) {
return true;
}

static const u8 kHintNop10Bytes[] = {
0x66, 0x66, 0x0F, 0x1F, 0x84,
0x00, 0x00, 0x00, 0x00, 0x00
};

template<class T>
static bool FunctionHasPrefix(uptr address, const T &pattern) {
u8* function = (u8*)address - sizeof(pattern);
for (size_t i = 0; i < sizeof(pattern); ++i)
if (function[i] != pattern[i])
return false;
return true;
}

static bool FunctionHasPadding(uptr address, uptr size) {
if (IsMemoryPadding(address - size, size))
return true;
if (size <= sizeof(kHintNop10Bytes) &&
FunctionHasPrefix(address, kHintNop10Bytes))
return true;
return false;
}

static void WritePadding(uptr from, uptr size) {
_memset((void*)from, 0xCC, (size_t)size);
}
Expand Down Expand Up @@ -617,7 +640,7 @@ bool OverrideFunctionWithHotPatch(
// Validate that the function is hot patchable.
size_t instruction_size = GetInstructionSize(old_func);
if (instruction_size < kShortJumpInstructionLength ||
!IsMemoryPadding(header, kHotPatchHeaderLen))
!FunctionHasPadding(old_func, kHotPatchHeaderLen))
return false;

if (orig_old_func) {
Expand Down

0 comments on commit 9c2a220

Please sign in to comment.