diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/asan/asan_allocator.cc | 2 | ||||
| -rw-r--r-- | lib/asan/asan_flags.h | 2 | ||||
| -rw-r--r-- | lib/asan/asan_globals.cc | 2 | ||||
| -rw-r--r-- | lib/asan/asan_interceptors.cc | 2 | ||||
| -rw-r--r-- | lib/asan/asan_interface.h | 201 | ||||
| -rw-r--r-- | lib/asan/asan_poisoning.cc | 2 | ||||
| -rw-r--r-- | lib/asan/asan_report.h | 2 | ||||
| -rw-r--r-- | lib/asan/asan_rtl.cc | 2 | ||||
| -rw-r--r-- | lib/asan/asan_stack.cc | 2 | ||||
| -rw-r--r-- | lib/asan/asan_stats.cc | 2 | ||||
| -rw-r--r-- | lib/asan/lit_tests/interface_symbols.c | 3 | ||||
| -rwxr-xr-x | lib/asan/output_tests/test_output.sh | 2 | ||||
| -rw-r--r-- | lib/asan/tests/asan_noinst_test.cc | 3 | ||||
| -rw-r--r-- | lib/sanitizer_common/sanitizer_interface_defs.h | 56 | ||||
| -rw-r--r-- | lib/sanitizer_common/sanitizer_internal_defs.h | 2 | ||||
| -rw-r--r-- | lib/sanitizer_common/sanitizer_libc.h | 2 |
16 files changed, 16 insertions, 271 deletions
diff --git a/lib/asan/asan_allocator.cc b/lib/asan/asan_allocator.cc index e64085dc..924f292a 100644 --- a/lib/asan/asan_allocator.cc +++ b/lib/asan/asan_allocator.cc @@ -27,7 +27,6 @@ #include "asan_allocator.h" #include "asan_interceptors.h" -#include "asan_interface.h" #include "asan_internal.h" #include "asan_lock.h" #include "asan_mapping.h" @@ -35,6 +34,7 @@ #include "asan_report.h" #include "asan_thread.h" #include "asan_thread_registry.h" +#include "sanitizer/asan_interface.h" #include "sanitizer_common/sanitizer_atomic.h" #if defined(_WIN32) && !defined(__clang__) diff --git a/lib/asan/asan_flags.h b/lib/asan/asan_flags.h index 8b5c11ca..ce30fcbd 100644 --- a/lib/asan/asan_flags.h +++ b/lib/asan/asan_flags.h @@ -15,7 +15,7 @@ #ifndef ASAN_FLAGS_H #define ASAN_FLAGS_H -#include "sanitizer_common/sanitizer_interface_defs.h" +#include "sanitizer/common_interface_defs.h" // ASan flag values can be defined in three ways: // 1) initialized with default values at startup. diff --git a/lib/asan/asan_globals.cc b/lib/asan/asan_globals.cc index 377a4c6f..6e90cb5f 100644 --- a/lib/asan/asan_globals.cc +++ b/lib/asan/asan_globals.cc @@ -12,7 +12,6 @@ // Handle globals. //===----------------------------------------------------------------------===// #include "asan_interceptors.h" -#include "asan_interface.h" #include "asan_internal.h" #include "asan_lock.h" #include "asan_mapping.h" @@ -20,6 +19,7 @@ #include "asan_stack.h" #include "asan_stats.h" #include "asan_thread.h" +#include "sanitizer/asan_interface.h" namespace __asan { diff --git a/lib/asan/asan_interceptors.cc b/lib/asan/asan_interceptors.cc index 71ea623c..db0e00bd 100644 --- a/lib/asan/asan_interceptors.cc +++ b/lib/asan/asan_interceptors.cc @@ -15,7 +15,6 @@ #include "asan_allocator.h" #include "asan_intercepted_functions.h" -#include "asan_interface.h" #include "asan_internal.h" #include "asan_mapping.h" #include "asan_report.h" @@ -23,6 +22,7 @@ #include "asan_stats.h" #include "asan_thread_registry.h" #include "interception/interception.h" +#include "sanitizer/asan_interface.h" #include "sanitizer_common/sanitizer_libc.h" namespace __asan { diff --git a/lib/asan/asan_interface.h b/lib/asan/asan_interface.h deleted file mode 100644 index 54a0312f..00000000 --- a/lib/asan/asan_interface.h +++ /dev/null @@ -1,201 +0,0 @@ -//===-- asan_interface.h ----------------------------------------*- C++ -*-===// -// -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// -// -// This file is a part of AddressSanitizer, an address sanity checker. -// -// This header can be included by the instrumented program to fetch -// data (mostly allocator statistics) from ASan runtime library. -//===----------------------------------------------------------------------===// -#ifndef ASAN_INTERFACE_H -#define ASAN_INTERFACE_H - -#include "sanitizer_common/sanitizer_interface_defs.h" -// ----------- ATTENTION ------------- -// This header should NOT include any other headers from ASan runtime. -// All functions in this header are extern "C" and start with __asan_. - -using __sanitizer::uptr; - -extern "C" { - // This function should be called at the very beginning of the process, - // before any instrumented code is executed and before any call to malloc. - void __asan_init() SANITIZER_INTERFACE_ATTRIBUTE; - - // This function should be called by the instrumented code. - // 'addr' is the address of a global variable called 'name' of 'size' bytes. - void __asan_register_global(uptr addr, uptr size, const char *name) - SANITIZER_INTERFACE_ATTRIBUTE; - - // This structure describes an instrumented global variable. - struct __asan_global { - uptr beg; // The address of the global. - uptr size; // The original size of the global. - uptr size_with_redzone; // The size with the redzone. - const char *name; // Name as a C string. - uptr has_dynamic_init; // Non-zero if the global has dynamic initializer. - }; - - // These two functions should be called by the instrumented code. - // 'globals' is an array of structures describing 'n' globals. - void __asan_register_globals(__asan_global *globals, uptr n) - SANITIZER_INTERFACE_ATTRIBUTE; - void __asan_unregister_globals(__asan_global *globals, uptr n) - SANITIZER_INTERFACE_ATTRIBUTE; - - // These two functions should be called before and after dynamic initializers - // run, respectively. They should be called with parameters describing all - // dynamically initialized globals defined in the calling TU. - void __asan_before_dynamic_init(uptr first_addr, uptr last_addr) - SANITIZER_INTERFACE_ATTRIBUTE; - void __asan_after_dynamic_init() - SANITIZER_INTERFACE_ATTRIBUTE; - - // These two functions are used by the instrumented code in the - // use-after-return mode. __asan_stack_malloc allocates size bytes of - // fake stack and __asan_stack_free poisons it. real_stack is a pointer to - // the real stack region. - uptr __asan_stack_malloc(uptr size, uptr real_stack) - SANITIZER_INTERFACE_ATTRIBUTE; - void __asan_stack_free(uptr ptr, uptr size, uptr real_stack) - SANITIZER_INTERFACE_ATTRIBUTE; - - // Marks memory region [addr, addr+size) as unaddressable. - // This memory must be previously allocated by the user program. Accessing - // addresses in this region from instrumented code is forbidden until - // this region is unpoisoned. This function is not guaranteed to poison - // the whole region - it may poison only subregion of [addr, addr+size) due - // to ASan alignment restrictions. - // Method is NOT thread-safe in the sense that no two threads can - // (un)poison memory in the same memory region simultaneously. - void __asan_poison_memory_region(void const volatile *addr, uptr size) - SANITIZER_INTERFACE_ATTRIBUTE; - // Marks memory region [addr, addr+size) as addressable. - // This memory must be previously allocated by the user program. Accessing - // addresses in this region is allowed until this region is poisoned again. - // This function may unpoison a superregion of [addr, addr+size) due to - // ASan alignment restrictions. - // Method is NOT thread-safe in the sense that no two threads can - // (un)poison memory in the same memory region simultaneously. - void __asan_unpoison_memory_region(void const volatile *addr, uptr size) - SANITIZER_INTERFACE_ATTRIBUTE; - - // Performs cleanup before a NoReturn function. Must be called before things - // like _exit and execl to avoid false positives on stack. - void __asan_handle_no_return() SANITIZER_INTERFACE_ATTRIBUTE; - -// User code should use macro instead of functions. -#if __has_feature(address_sanitizer) -#define ASAN_POISON_MEMORY_REGION(addr, size) \ - __asan_poison_memory_region((addr), (size)) -#define ASAN_UNPOISON_MEMORY_REGION(addr, size) \ - __asan_unpoison_memory_region((addr), (size)) -#else -#define ASAN_POISON_MEMORY_REGION(addr, size) \ - ((void)(addr), (void)(size)) -#define ASAN_UNPOISON_MEMORY_REGION(addr, size) \ - ((void)(addr), (void)(size)) -#endif - - // Returns true iff addr is poisoned (i.e. 1-byte read/write access to this - // address will result in error report from AddressSanitizer). - bool __asan_address_is_poisoned(void const volatile *addr) - SANITIZER_INTERFACE_ATTRIBUTE; - - // This is an internal function that is called to report an error. - // However it is still a part of the interface because users may want to - // set a breakpoint on this function in a debugger. - void __asan_report_error(uptr pc, uptr bp, uptr sp, - uptr addr, bool is_write, uptr access_size) - SANITIZER_INTERFACE_ATTRIBUTE; - - // Sets the exit code to use when reporting an error. - // Returns the old value. - int __asan_set_error_exit_code(int exit_code) - SANITIZER_INTERFACE_ATTRIBUTE; - - // Sets the callback to be called right before death on error. - // Passing 0 will unset the callback. - void __asan_set_death_callback(void (*callback)(void)) - SANITIZER_INTERFACE_ATTRIBUTE; - - void __asan_set_error_report_callback(void (*callback)(const char*)) - SANITIZER_INTERFACE_ATTRIBUTE; - - // Sets the callback to be called right when ASan detects an error. - // This can be used to notice cases when ASan detects an error, but the - // program crashes before ASan report is printed. - // Passing 0 unsets the callback. - void __asan_set_on_error_callback(void (*callback)(void)) - SANITIZER_INTERFACE_ATTRIBUTE; - - // User may register its own symbolization function. It should print - // the description of instruction at address "pc" to "out_buffer". - // Description should be at most "out_size" bytes long. - // User-specified function should return true if symbolization was - // successful. - typedef bool (*__asan_symbolize_callback)(const void *pc, char *out_buffer, - int out_size); - void __asan_set_symbolize_callback(__asan_symbolize_callback callback) - SANITIZER_INTERFACE_ATTRIBUTE; - - // Returns the estimated number of bytes that will be reserved by allocator - // for request of "size" bytes. If ASan allocator can't allocate that much - // memory, returns the maximal possible allocation size, otherwise returns - // "size". - uptr __asan_get_estimated_allocated_size(uptr size) - SANITIZER_INTERFACE_ATTRIBUTE; - // Returns true if p was returned by the ASan allocator and - // is not yet freed. - bool __asan_get_ownership(const void *p) - SANITIZER_INTERFACE_ATTRIBUTE; - // Returns the number of bytes reserved for the pointer p. - // Requires (get_ownership(p) == true) or (p == 0). - uptr __asan_get_allocated_size(const void *p) - SANITIZER_INTERFACE_ATTRIBUTE; - // Number of bytes, allocated and not yet freed by the application. - uptr __asan_get_current_allocated_bytes() - SANITIZER_INTERFACE_ATTRIBUTE; - // Number of bytes, mmaped by asan allocator to fulfill allocation requests. - // Generally, for request of X bytes, allocator can reserve and add to free - // lists a large number of chunks of size X to use them for future requests. - // All these chunks count toward the heap size. Currently, allocator never - // releases memory to OS (instead, it just puts freed chunks to free lists). - uptr __asan_get_heap_size() - SANITIZER_INTERFACE_ATTRIBUTE; - // Number of bytes, mmaped by asan allocator, which can be used to fulfill - // allocation requests. When a user program frees memory chunk, it can first - // fall into quarantine and will count toward __asan_get_free_bytes() later. - uptr __asan_get_free_bytes() - SANITIZER_INTERFACE_ATTRIBUTE; - // Number of bytes in unmapped pages, that are released to OS. Currently, - // always returns 0. - uptr __asan_get_unmapped_bytes() - SANITIZER_INTERFACE_ATTRIBUTE; - // Prints accumulated stats to stderr. Used for debugging. - void __asan_print_accumulated_stats() - SANITIZER_INTERFACE_ATTRIBUTE; - - // This function may be overriden by user to provide a string containing - // ASan runtime options. See asan_flags.h for details. - const char* __asan_default_options() - SANITIZER_WEAK_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE; - - // Malloc hooks that may be overriden by user. - // __asan_malloc_hook(ptr, size) is called immediately after - // allocation of "size" bytes, which returned "ptr". - // __asan_free_hook(ptr) is called immediately before - // deallocation of "ptr". - // If user doesn't provide implementations of these hooks, they are no-op. - void __asan_malloc_hook(void *ptr, uptr size) - SANITIZER_WEAK_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE; - void __asan_free_hook(void *ptr) - SANITIZER_WEAK_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE; -} // extern "C" - -#endif // ASAN_INTERFACE_H diff --git a/lib/asan/asan_poisoning.cc b/lib/asan/asan_poisoning.cc index 3b9d9f67..ce9de927 100644 --- a/lib/asan/asan_poisoning.cc +++ b/lib/asan/asan_poisoning.cc @@ -13,9 +13,9 @@ //===----------------------------------------------------------------------===// #include "asan_interceptors.h" -#include "asan_interface.h" #include "asan_internal.h" #include "asan_mapping.h" +#include "sanitizer/asan_interface.h" namespace __asan { diff --git a/lib/asan/asan_report.h b/lib/asan/asan_report.h index e7ef326a..08456905 100644 --- a/lib/asan/asan_report.h +++ b/lib/asan/asan_report.h @@ -12,8 +12,8 @@ // ASan-private header for error reporting functions. //===----------------------------------------------------------------------===// -#include "asan_interface.h" #include "asan_internal.h" +#include "sanitizer/asan_interface.h" namespace __asan { diff --git a/lib/asan/asan_rtl.cc b/lib/asan/asan_rtl.cc index a2e85fd5..2970fd5e 100644 --- a/lib/asan/asan_rtl.cc +++ b/lib/asan/asan_rtl.cc @@ -13,7 +13,6 @@ //===----------------------------------------------------------------------===// #include "asan_allocator.h" #include "asan_interceptors.h" -#include "asan_interface.h" #include "asan_internal.h" #include "asan_lock.h" #include "asan_mapping.h" @@ -22,6 +21,7 @@ #include "asan_stats.h" #include "asan_thread.h" #include "asan_thread_registry.h" +#include "sanitizer/asan_interface.h" #include "sanitizer_common/sanitizer_atomic.h" #include "sanitizer_common/sanitizer_flags.h" #include "sanitizer_common/sanitizer_libc.h" diff --git a/lib/asan/asan_stack.cc b/lib/asan/asan_stack.cc index a69accdb..f8ebc823 100644 --- a/lib/asan/asan_stack.cc +++ b/lib/asan/asan_stack.cc @@ -12,8 +12,8 @@ // Code for ASan stack trace. //===----------------------------------------------------------------------===// #include "asan_flags.h" -#include "asan_interface.h" #include "asan_stack.h" +#include "sanitizer/asan_interface.h" namespace __asan { diff --git a/lib/asan/asan_stats.cc b/lib/asan/asan_stats.cc index c286c373..189315bd 100644 --- a/lib/asan/asan_stats.cc +++ b/lib/asan/asan_stats.cc @@ -12,11 +12,11 @@ // Code related to statistics collected by AddressSanitizer. //===----------------------------------------------------------------------===// #include "asan_interceptors.h" -#include "asan_interface.h" #include "asan_internal.h" #include "asan_lock.h" #include "asan_stats.h" #include "asan_thread_registry.h" +#include "sanitizer/asan_interface.h" namespace __asan { diff --git a/lib/asan/lit_tests/interface_symbols.c b/lib/asan/lit_tests/interface_symbols.c index 8b92695c..03998d5c 100644 --- a/lib/asan/lit_tests/interface_symbols.c +++ b/lib/asan/lit_tests/interface_symbols.c @@ -3,7 +3,8 @@ // RUN: %clang -faddress-sanitizer -dead_strip -O2 %s -o %t.exe // RUN: nm %t.exe | egrep " [TW] " | sed "s/.* T //" | sed "s/.* W //" \ // RUN: | grep "__asan_" | sed "s/___asan_/__asan_/" > %t.symbols -// RUN: cat %p/../asan_interface.h | sed "s/\/\/.*//" | sed "s/typedef.*//" \ +// RUN: cat %p/../../../include/sanitizer/asan_interface.h \ +// RUN: | sed "s/\/\/.*//" | sed "s/typedef.*//" \ // RUN: | grep "__asan_.*(" | sed "s/.* __asan_/__asan_/;s/(.*//" \ // RUN: > %t.interface // RUN: echo __asan_report_load1 >> %t.interface diff --git a/lib/asan/output_tests/test_output.sh b/lib/asan/output_tests/test_output.sh index fb2d74cb..eef8ef6f 100755 --- a/lib/asan/output_tests/test_output.sh +++ b/lib/asan/output_tests/test_output.sh @@ -8,7 +8,7 @@ CC=$2 FILE_CHECK=$3 CXXFLAGS="-mno-omit-leaf-frame-pointer -fno-omit-frame-pointer -fno-optimize-sibling-calls -g" SYMBOLIZER=../scripts/asan_symbolize.py -ASAN_INTERFACE_H=../asan_interface.h +ASAN_INTERFACE_H=../../../include/sanitizer/asan_interface.h TMP_ASAN_REPORT=asan_report.tmp run_program() { diff --git a/lib/asan/tests/asan_noinst_test.cc b/lib/asan/tests/asan_noinst_test.cc index e3264979..70b59f02 100644 --- a/lib/asan/tests/asan_noinst_test.cc +++ b/lib/asan/tests/asan_noinst_test.cc @@ -11,13 +11,14 @@ // // This test file should be compiled w/o asan instrumentation. //===----------------------------------------------------------------------===// + #include "asan_allocator.h" -#include "asan_interface.h" #include "asan_internal.h" #include "asan_mapping.h" #include "asan_stack.h" #include "asan_test_utils.h" #include "asan_test_config.h" +#include "sanitizer/asan_interface.h" #include <assert.h> #include <stdio.h> diff --git a/lib/sanitizer_common/sanitizer_interface_defs.h b/lib/sanitizer_common/sanitizer_interface_defs.h deleted file mode 100644 index 2395ea50..00000000 --- a/lib/sanitizer_common/sanitizer_interface_defs.h +++ /dev/null @@ -1,56 +0,0 @@ -//===-- sanitizer_interface_defs.h -----------------------------*- C++ -*-===// -// -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// -// -// This file is shared between AddressSanitizer and ThreadSanitizer. -// It contains basic macro and types. -// NOTE: This file may be included into user code. -//===----------------------------------------------------------------------===// - -#ifndef SANITIZER_INTERFACE_DEFS_H -#define SANITIZER_INTERFACE_DEFS_H - -// ----------- ATTENTION ------------- -// This header should NOT include any other headers to avoid portability issues. - -#if defined(_WIN32) -// FIXME find out what we need on Windows. __declspec(dllexport) ? -# define SANITIZER_INTERFACE_ATTRIBUTE -# define SANITIZER_WEAK_ATTRIBUTE -#elif defined(SANITIZER_GO) -# define SANITIZER_INTERFACE_ATTRIBUTE -# define SANITIZER_WEAK_ATTRIBUTE -#else -# define SANITIZER_INTERFACE_ATTRIBUTE __attribute__((visibility("default"))) -# define SANITIZER_WEAK_ATTRIBUTE __attribute__((weak)) -#endif - -// __has_feature -#if !defined(__has_feature) -# define __has_feature(x) 0 -#endif - -// For portability reasons we do not include stddef.h, stdint.h or any other -// system header, but we do need some basic types that are not defined -// in a portable way by the language itself. -namespace __sanitizer { - -typedef unsigned long uptr; // NOLINT -typedef signed long sptr; // NOLINT -typedef unsigned char u8; -typedef unsigned short u16; // NOLINT -typedef unsigned int u32; -typedef unsigned long long u64; // NOLINT -typedef signed char s8; -typedef signed short s16; // NOLINT -typedef signed int s32; -typedef signed long long s64; // NOLINT - -} // namespace __sanitizer - -#endif // SANITIZER_INTERFACE_DEFS_H diff --git a/lib/sanitizer_common/sanitizer_internal_defs.h b/lib/sanitizer_common/sanitizer_internal_defs.h index 98d911c6..5d00cd04 100644 --- a/lib/sanitizer_common/sanitizer_internal_defs.h +++ b/lib/sanitizer_common/sanitizer_internal_defs.h @@ -13,7 +13,7 @@ #ifndef SANITIZER_DEFS_H #define SANITIZER_DEFS_H -#include "sanitizer_interface_defs.h" +#include "sanitizer/common_interface_defs.h" using namespace __sanitizer; // NOLINT // ----------- ATTENTION ------------- // This header should NOT include any other headers to avoid portability issues. diff --git a/lib/sanitizer_common/sanitizer_libc.h b/lib/sanitizer_common/sanitizer_libc.h index 257af2c2..8c3a78cd 100644 --- a/lib/sanitizer_common/sanitizer_libc.h +++ b/lib/sanitizer_common/sanitizer_libc.h @@ -18,7 +18,7 @@ // ----------- ATTENTION ------------- // This header should NOT include any other headers from sanitizer runtime. -#include "sanitizer_interface_defs.h" +#include "sanitizer/common_interface_defs.h" namespace __sanitizer { |