diff options
author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2013-10-29 02:48:49 +0000 |
---|---|---|
committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2013-10-29 02:48:49 +0000 |
commit | f3603890015c130420def39d67a02c2fdafc6f84 (patch) | |
tree | 61101f89f370946c082997dc6f6fe83363955ee0 /lib/msan | |
parent | 1767ec1c0d56bf9a4a5470ec5b28905e23892753 (diff) | |
download | compiler-rt-f3603890015c130420def39d67a02c2fdafc6f84.tar.gz compiler-rt-f3603890015c130420def39d67a02c2fdafc6f84.tar.bz2 compiler-rt-f3603890015c130420def39d67a02c2fdafc6f84.tar.xz |
[msan] Intercept shmat.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@193581 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/msan')
-rw-r--r-- | lib/msan/msan_interceptors.cc | 17 | ||||
-rw-r--r-- | lib/msan/tests/msan_test.cc | 28 |
2 files changed, 45 insertions, 0 deletions
diff --git a/lib/msan/msan_interceptors.cc b/lib/msan/msan_interceptors.cc index 842270dc..0c42e047 100644 --- a/lib/msan/msan_interceptors.cc +++ b/lib/msan/msan_interceptors.cc @@ -1157,6 +1157,22 @@ INTERCEPTOR(int, __cxa_atexit, void (*func)(void *), void *arg, return REAL(__cxa_atexit)(MSanAtExitWrapper, r, dso_handle); } +DECLARE_REAL(int, shmctl, int shmid, int cmd, void *buf) + +INTERCEPTOR(void *, shmat, int shmid, const void *shmaddr, int shmflg) { + ENSURE_MSAN_INITED(); + void *p = REAL(shmat)(shmid, shmaddr, shmflg); + if (p != (void *)-1) { + __sanitizer_shmid_ds ds; + int res = REAL(shmctl)(shmid, shmctl_ipc_stat, &ds); + if (!res) { + __msan_unpoison(p, ds.shm_segsz); + } + } + return p; +} + + struct MSanInterceptorContext { bool in_interceptor_scope; }; @@ -1459,6 +1475,7 @@ void InitializeInterceptors() { INTERCEPT_FUNCTION(pthread_join); INTERCEPT_FUNCTION(tzset); INTERCEPT_FUNCTION(__cxa_atexit); + INTERCEPT_FUNCTION(shmat); if (REAL(pthread_key_create)(&g_thread_finalize_key, &thread_finalize)) { Printf("MemorySanitizer: failed to create thread key\n"); diff --git a/lib/msan/tests/msan_test.cc b/lib/msan/tests/msan_test.cc index e6923828..dd9669be 100644 --- a/lib/msan/tests/msan_test.cc +++ b/lib/msan/tests/msan_test.cc @@ -1146,6 +1146,34 @@ TEST(MemorySanitizer, shmctl) { ASSERT_GT(res, -1); } +TEST(MemorySanitizer, shmat) { + void *p = mmap(NULL, 4096, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, 0, 0); + ASSERT_NE(MAP_FAILED, p); + + ((char *)p)[10] = *GetPoisoned<U1>(); + ((char *)p)[4095] = *GetPoisoned<U1>(); + + int res = munmap(p, 4096); + ASSERT_EQ(0, res); + + int id = shmget(IPC_PRIVATE, 4096, 0644 | IPC_CREAT); + ASSERT_GT(id, -1); + + void *q = shmat(id, p, 0); + ASSERT_EQ(p, q); + + EXPECT_NOT_POISONED(((char *)q)[0]); + EXPECT_NOT_POISONED(((char *)q)[10]); + EXPECT_NOT_POISONED(((char *)q)[4095]); + + res = shmdt(q); + ASSERT_EQ(0, res); + + res = shmctl(id, IPC_RMID, 0); + ASSERT_GT(res, -1); +} + TEST(MemorySanitizer, random_r) { int32_t x; char z[64]; |