Fix asan infinite loop on undefined symbol
Fix llvm#39641 Recommit of r366413 Differential Revision: https://reviews.llvm.org/D63877 > llvm-svn: 366632 llvm-svn: 366638
This commit is contained in:
parent
cd9b19484b
commit
a30a4a35ec
|
@ -33,7 +33,7 @@ static int StrCmp(const char *s1, const char *s2) {
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static void *GetFuncAddr(const char *name) {
|
static void *GetFuncAddr(const char *name, uptr wrapper_addr) {
|
||||||
#if SANITIZER_NETBSD
|
#if SANITIZER_NETBSD
|
||||||
// FIXME: Find a better way to handle renames
|
// FIXME: Find a better way to handle renames
|
||||||
if (StrCmp(name, "sigaction"))
|
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
|
// want the address of the real definition, though, so look it up using
|
||||||
// RTLD_DEFAULT.
|
// RTLD_DEFAULT.
|
||||||
addr = dlsym(RTLD_DEFAULT, name);
|
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;
|
return addr;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool InterceptFunction(const char *name, uptr *ptr_to_real, uptr func,
|
bool InterceptFunction(const char *name, uptr *ptr_to_real, uptr func,
|
||||||
uptr wrapper) {
|
uptr wrapper) {
|
||||||
void *addr = GetFuncAddr(name);
|
void *addr = GetFuncAddr(name, wrapper);
|
||||||
*ptr_to_real = (uptr)addr;
|
*ptr_to_real = (uptr)addr;
|
||||||
return addr && (func == wrapper);
|
return addr && (func == wrapper);
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,43 @@
|
||||||
|
// 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_64-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
|
Loading…
Reference in New Issue