From 3f6af151df0b971bb0f0f2b20e15dc7cee11ac72 Mon Sep 17 00:00:00 2001 From: Evgeniy Stepanov Date: Thu, 30 Jan 2014 14:31:26 +0000 Subject: [PATCH] [sanitizer] Fix typo that breaks shmctl() interceptor. https://code.google.com/p/address-sanitizer/issues/detail?id=259 llvm-svn: 200468 --- compiler-rt/lib/asan/lit_tests/TestCases/Linux/shmctl.cc | 6 ++++++ .../lib/sanitizer_common/sanitizer_platform_limits_posix.cc | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/shmctl.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/shmctl.cc index 2de14776c92d..c2e650a40dea 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/shmctl.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/shmctl.cc @@ -15,4 +15,10 @@ int main() { printf("shm_segsz: %zd\n", ds.shm_segsz); assert(ds.shm_segsz == 4096); assert(-1 != shmctl(id, IPC_RMID, 0)); + + struct shm_info shmInfo; + res = shmctl(0, SHM_INFO, (struct shmid_ds *)&shmInfo); + assert(res > -1); + + return 0; } diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc index 24f43b69b7ee..0e1e21c0dd17 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc @@ -193,7 +193,7 @@ namespace __sanitizer { int shmctl_ipc_stat = (int)IPC_STAT; int shmctl_ipc_info = (int)IPC_INFO; int shmctl_shm_info = (int)SHM_INFO; - int shmctl_shm_stat = (int)SHM_INFO; + int shmctl_shm_stat = (int)SHM_STAT; #endif int map_fixed = MAP_FIXED;