diff options
| author | Etienne Bergeron <etienneb@google.com> | 2016-07-12 19:39:07 +0000 |
|---|---|---|
| committer | Etienne Bergeron <etienneb@google.com> | 2016-07-12 19:39:07 +0000 |
| commit | cb44d52112956de7705a894cde22483eafb33b54 (patch) | |
| tree | 3091cf79a4c269aa4d13d1f4db7fa47e8326569f | |
| parent | 05cef4014c2a4637ec4324de325d8750f8aaeab1 (diff) | |
| download | compiler-rt-cb44d52112956de7705a894cde22483eafb33b54.tar.gz | |
[asan] Fix interception unittest on Windows64.
mov edi,edi is _not_ NOP in 64-bit, use 66,90h instead.
This bug was causing interception unittest to crash on
Windows64 (windows 8 and windows 10).
Credits to etienneb for finding the root cause.
Patch by: Wei Wang
Differential Revision: http://reviews.llvm.org/D22274
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@275207 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/interception/interception_win.cc | 1 | ||||
| -rw-r--r-- | lib/interception/tests/interception_win_test.cc | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/lib/interception/interception_win.cc b/lib/interception/interception_win.cc index 994961adc..1db8ac481 100644 --- a/lib/interception/interception_win.cc +++ b/lib/interception/interception_win.cc @@ -461,6 +461,7 @@ static size_t GetInstructionSize(uptr address) { case 0x5541: // push r13 case 0x5641: // push r14 case 0x5741: // push r15 + case 0x9066: // Two-byte NOP return 2; } diff --git a/lib/interception/tests/interception_win_test.cc b/lib/interception/tests/interception_win_test.cc index 642afd545..611354f03 100644 --- a/lib/interception/tests/interception_win_test.cc +++ b/lib/interception/tests/interception_win_test.cc @@ -234,8 +234,18 @@ static void LoadActiveCode( // Add the detour instruction (i.e. mov edi, edi) 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++] = 0xFF; +#endif + } // Copy the function body. |