From 2c56f33dbf6d56f61ecdff2cc75a2c1a53f16584 Mon Sep 17 00:00:00 2001 From: "Mohit K. Bhakkad" Date: Wed, 24 Feb 2016 08:14:41 +0000 Subject: [PATCH] [MSan] fix process_vm_readv test: Exit silently if syscall is not implemeted Reviewers: eugenis Subscribers: jaydeep, sagar, llvm-commits Differential Revision: http://reviews.llvm.org/D17560 llvm-svn: 261723 --- compiler-rt/test/msan/Linux/process_vm_readv.cc | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/compiler-rt/test/msan/Linux/process_vm_readv.cc b/compiler-rt/test/msan/Linux/process_vm_readv.cc index 601c0d2..b61578d 100644 --- a/compiler-rt/test/msan/Linux/process_vm_readv.cc +++ b/compiler-rt/test/msan/Linux/process_vm_readv.cc @@ -9,26 +9,31 @@ #include #include #include +#include typedef ssize_t (*process_vm_readwritev_fn)(pid_t, const iovec *, unsigned long, const iovec *, unsigned long, unsigned long); -int main(void) { - // This requires glibc 2.15. - process_vm_readwritev_fn libc_process_vm_readv = - (process_vm_readwritev_fn)dlsym(RTLD_NEXT, "process_vm_readv"); - if (!libc_process_vm_readv) { // Exit with success, emulating the expected output. +int exit_dummy() +{ #ifdef POSITIVE - printf("process_vm_readv not found!\n"); + printf("process_vm_readv not found or not implemented!\n"); printf( "WARNING: MemorySanitizer: use-of-uninitialized-value (not really)\n"); return 1; #else return 0; #endif - } +} + +int main(void) { + // This requires glibc 2.15. + process_vm_readwritev_fn libc_process_vm_readv = + (process_vm_readwritev_fn)dlsym(RTLD_NEXT, "process_vm_readv"); + if (!libc_process_vm_readv) + return exit_dummy(); process_vm_readwritev_fn process_vm_readv = (process_vm_readwritev_fn)dlsym(RTLD_DEFAULT, "process_vm_readv"); @@ -44,6 +49,9 @@ int main(void) { __msan_poison(&b, sizeof(b)); ssize_t res = process_vm_readv(getpid(), iov_b, 2, iov_a, 2, 0); + if (errno == ENOSYS) // Function not implemented + return exit_dummy(); + assert(res == 30); __msan_check_mem_is_initialized(b + 10, 10); __msan_check_mem_is_initialized(b + 30, 20); -- 2.7.4