OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

[compiler-rt] Fix memmove/memcpy overlap detection on windows 

Summary:
The memcpy and memmove functions are the same on windows.
The overlap detection logic is incorrect.

printf-1 test:
```
stdin>:2:114: note: possible intended match here
==877412==ERROR: AddressSanitizer: memcpy-param-overlap: memory ranges [0x0000002bf2a8,0x0000002bf2ad) and [0x0000002bf2a9, 0x0000002bf2ae) overlap
```                                                                                                                 ^

Reviewers: rnk

Subscribers: llvm-commits, wang0109, kubabrecka, chrisha

Differential Revision: https://reviews.llvm.org/D22610

llvm-svn: 276299
This commit is contained in:
Etienne Bergeron 2016-07-21 16:06:54 +00:00
parent 3c0d8d22fe
commit aa76a0cf91
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compiler-rt/lib/asan/asan_interceptors.cc
View File

@ -725,11 +725,12 @@ void InitializeAsanInterceptors() {
InitializeCommonInterceptors(); InitializeCommonInterceptors();
// Intercept mem* functions. // Intercept mem* functions.
ASAN_INTERCEPT_FUNC(memcpy);
ASAN_INTERCEPT_FUNC(memset); ASAN_INTERCEPT_FUNC(memset);
ASAN_INTERCEPT_FUNC(memmove);
if (PLATFORM_HAS_DIFFERENT_MEMCPY_AND_MEMMOVE) { if (PLATFORM_HAS_DIFFERENT_MEMCPY_AND_MEMMOVE) {
// In asan, REAL(memmove) is not used, but it is used in msan. ASAN_INTERCEPT_FUNC(memcpy);
ASAN_INTERCEPT_FUNC(memmove); } else {
REAL(memcpy) = REAL(memmove);
} }
CHECK(REAL(memcpy)); CHECK(REAL(memcpy));

2
compiler-rt/lib/asan/tests/asan_str_test.cc
View File

@ -456,12 +456,14 @@ TEST(AddressSanitizer, StrArgsOverlapTest) {
// memmove(). // memmove().
#if !defined(__APPLE__) || !defined(MAC_OS_X_VERSION_10_7) || \ #if !defined(__APPLE__) || !defined(MAC_OS_X_VERSION_10_7) || \
(MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7) (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7)
#if PLATFORM_HAS_DIFFERENT_MEMCPY_AND_MEMMOVE
// Check "memcpy". Use Ident() to avoid inlining. // Check "memcpy". Use Ident() to avoid inlining.
memset(str, 'z', size); memset(str, 'z', size);
Ident(memcpy)(str + 1, str + 11, 10); Ident(memcpy)(str + 1, str + 11, 10);
Ident(memcpy)(str, str, 0); Ident(memcpy)(str, str, 0);
EXPECT_DEATH(Ident(memcpy)(str, str + 14, 15), OverlapErrorMessage("memcpy")); EXPECT_DEATH(Ident(memcpy)(str, str + 14, 15), OverlapErrorMessage("memcpy"));
EXPECT_DEATH(Ident(memcpy)(str + 14, str, 15), OverlapErrorMessage("memcpy")); EXPECT_DEATH(Ident(memcpy)(str + 14, str, 15), OverlapErrorMessage("memcpy"));
#endif
#endif #endif
// We do not treat memcpy with to==from as a bug. // We do not treat memcpy with to==from as a bug.