diff options
author | Serge Guelton <sguelton@redhat.com> | 2019-07-18 08:09:31 +0000 |
---|---|---|
committer | Serge Guelton <sguelton@redhat.com> | 2019-07-18 08:09:31 +0000 |
commit | 41522da1fb978b3d17e9fbf84a0f490ab6855c57 (patch) | |
tree | a18ce5e3fa4ced6ed1b52abe5fc538d0c8164b77 | |
parent | 47487fe5640d61713096e02d4255595179500d6c (diff) | |
download | compiler-rt-41522da1fb978b3d17e9fbf84a0f490ab6855c57.tar.gz |
Fix asan infinite loop on undefined symbol
Fix llvm#39641
Differential Revision: https://reviews.llvm.org/D63877
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@366413 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/interception/interception_linux.cc | 9 | ||||
-rw-r--r-- | test/asan/TestCases/Linux/dlopen-mixed-c-cxx.c | 42 |
2 files changed, 49 insertions, 2 deletions
diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc index d07f060b5..4b27102a1 100644 --- a/lib/interception/interception_linux.cc +++ b/lib/interception/interception_linux.cc @@ -33,7 +33,7 @@ static int StrCmp(const char *s1, const char *s2) { } #endif -static void *GetFuncAddr(const char *name) { +static void *GetFuncAddr(const char *name, uptr wrapper_addr) { #if SANITIZER_NETBSD // FIXME: Find a better way to handle renames if (StrCmp(name, "sigaction")) @@ -47,13 +47,18 @@ static void *GetFuncAddr(const char *name) { // want the address of the real definition, though, so look it up using // RTLD_DEFAULT. addr = dlsym(RTLD_DEFAULT, name); + + // In case `name' is not loaded, dlsym ends up finding the actual wrapper. + // We don't want to intercept the wrapper and have it point to itself. + if ((uptr)addr == wrapper_addr) + addr = nullptr; } return addr; } bool InterceptFunction(const char *name, uptr *ptr_to_real, uptr func, uptr wrapper) { - void *addr = GetFuncAddr(name); + void *addr = GetFuncAddr(name, wrapper); *ptr_to_real = (uptr)addr; return addr && (func == wrapper); } diff --git a/test/asan/TestCases/Linux/dlopen-mixed-c-cxx.c b/test/asan/TestCases/Linux/dlopen-mixed-c-cxx.c new file mode 100644 index 000000000..8bce907ef --- /dev/null +++ b/test/asan/TestCases/Linux/dlopen-mixed-c-cxx.c @@ -0,0 +1,42 @@ +// RUN: %clangxx_asan -xc++ -shared -fPIC -o %t.so - < %s +// RUN: %clang_asan %s -o %t.out -ldl +// RUN: ASAN_OPTIONS=verbosity=1 not %t.out %t.so 2>&1 | FileCheck %s +// +// CHECK: AddressSanitizer: failed to intercept '__cxa_throw' +// +// dlopen() can not be intercepted on Android +// UNSUPPORTED: android +#ifdef __cplusplus + +static void foo(void) { + int i = 0; + throw(i); +} + +extern "C" { +int bar(void); +}; +int bar(void) { + try { + foo(); + } catch (int i) { + return i; + } + return -1; +} + +#else + +#include <assert.h> +#include <dlfcn.h> + +int main(int argc, char **argv) { + int (*bar)(void); + void *handle = dlopen(argv[1], RTLD_LAZY); + assert(handle); + bar = dlsym(handle, "bar"); + assert(bar); + return bar(); +} + +#endif |