replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Fix asan infinite loop on undefined symbol" 

This reverts commit 8e46275488.

This was failing on sanitizer-x86_64-linux and our internal CI.

llvm-svn: 366618
This commit is contained in:
Matthew Voss 2019-07-19 21:41:07 +00:00
parent f4038e75d2
commit 407e837540
2 changed files with 2 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compiler-rt/lib/interception/interception_linux.cc
View File

@ -33,7 +33,7 @@ static int StrCmp(const char *s1, const char *s2) {
}
#endif
static void *GetFuncAddr(const char *name, uptr wrapper_addr) {
static void *GetFuncAddr(const char *name) {
#if SANITIZER_NETBSD
// FIXME: Find a better way to handle renames
if (StrCmp(name, "sigaction"))
@ -47,18 +47,13 @@ static void *GetFuncAddr(const char *name, uptr wrapper_addr) {
// 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, wrapper);
void *addr = GetFuncAddr(name);
*ptr_to_real = (uptr)addr;
return addr && (func == wrapper);
}

42
compiler-rt/test/asan/TestCases/Linux/dlopen-mixed-c-cxx.c
View File

@ -1,42 +0,0 @@
// RUN: %clangxx_asan -xc++ -shared -fPIC -o %t.so - < %s
// RUN: %clang_asan %s -o %t.out -ldl
// RUN: env ASAN_OPTIONS=verbosity=1 %t.out %t.so 2>&1 | FileCheck %s
//
// CHECK: {{.*}}AddressSanitizer: failed to intercept '__cxa_{{.*}}throw{{.*}}'
//
// REQUIRES: x86-target-arch && !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