maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[msan] Fix strncat interceptor, add missing tests. 

llvm-svn: 197244
This commit is contained in:
Evgeniy Stepanov 2013-12-13 16:31:59 +00:00
parent 2cd9db1cef
commit 3158ec4002
2 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compiler-rt/lib/msan/msan_interceptors.cc
View File

@ -284,11 +284,10 @@ INTERCEPTOR(char *, strcat, char *dest, const char *src) { // NOLINT
INTERCEPTOR(char *, strncat, char *dest, const char *src, SIZE_T n) { // NOLINT INTERCEPTOR(char *, strncat, char *dest, const char *src, SIZE_T n) { // NOLINT
ENSURE_MSAN_INITED(); ENSURE_MSAN_INITED();
SIZE_T dest_size = REAL(strlen)(dest); SIZE_T dest_size = REAL(strlen)(dest);
SIZE_T copy_size = REAL(strlen)(src); SIZE_T copy_size = REAL(strnlen)(src, n);
if (copy_size < n)
copy_size++; // trailing \0
char *res = REAL(strncat)(dest, src, n); // NOLINT char *res = REAL(strncat)(dest, src, n); // NOLINT
__msan_copy_poison(dest + dest_size, src, copy_size); __msan_copy_poison(dest + dest_size, src, copy_size);
__msan_unpoison(dest + dest_size + copy_size, 1); // \0
return res; return res;
} }

39
compiler-rt/lib/msan/tests/msan_test.cc
View File

@ -1470,6 +1470,45 @@ TEST(MemorySanitizer, stpcpy) { // NOLINT
EXPECT_NOT_POISONED(y[2]); EXPECT_NOT_POISONED(y[2]);
} }
TEST(MemorySanitizer, strcat) { // NOLINT
char a[10];
char b[] = "def";
strcpy(a, "abc");
__msan_poison(b + 1, 1);
strcat(a, b);
EXPECT_NOT_POISONED(a[3]);
EXPECT_POISONED(a[4]);
EXPECT_NOT_POISONED(a[5]);
EXPECT_NOT_POISONED(a[6]);
EXPECT_POISONED(a[7]);
}
TEST(MemorySanitizer, strncat) { // NOLINT
char a[10];
char b[] = "def";
strcpy(a, "abc");
__msan_poison(b + 1, 1);
strncat(a, b, 5);
EXPECT_NOT_POISONED(a[3]);
EXPECT_POISONED(a[4]);
EXPECT_NOT_POISONED(a[5]);
EXPECT_NOT_POISONED(a[6]);
EXPECT_POISONED(a[7]);
}
TEST(MemorySanitizer, strncat_overflow) { // NOLINT
char a[10];
char b[] = "def";
strcpy(a, "abc");
__msan_poison(b + 1, 1);
strncat(a, b, 2);
EXPECT_NOT_POISONED(a[3]);
EXPECT_POISONED(a[4]);
EXPECT_NOT_POISONED(a[5]);
EXPECT_POISONED(a[6]);
EXPECT_POISONED(a[7]);
}
TEST(MemorySanitizer, strtol) { TEST(MemorySanitizer, strtol) {
char *e; char *e;
assert(1 == strtol("1", &e, 10)); assert(1 == strtol("1", &e, 10));