[compiler-rt] 3bb89b6 - Don't dead-end asan_foo() entrypoints in the shim
via llvm-commits
llvm-commits at lists.llvm.org
Tue Sep 26 18:13:55 PDT 2023
Author: rsundahl
Date: 2023-09-26T18:13:43-07:00
New Revision: 3bb89b6bfbb549a4b129698b0e56d758a1dcd8df
URL: https://github.com/llvm/llvm-project/commit/3bb89b6bfbb549a4b129698b0e56d758a1dcd8df
DIFF: https://github.com/llvm/llvm-project/commit/3bb89b6bfbb549a4b129698b0e56d758a1dcd8df.diff
LOG: Don't dead-end asan_foo() entrypoints in the shim
Some entrypoints supporting LLDB process introspection were not
being forwarded to asan_abi_foo() stable ABI entrypoints which
effectively dead-ended them in NOPs that could not be implemented
by Stable ABI.
rdar://115974403
Reviewed By: wrotki, vitalybuka, MaskRay
Differential Revision: https://reviews.llvm.org/D159545
Added:
Modified:
compiler-rt/lib/asan_abi/asan_abi.cpp
compiler-rt/lib/asan_abi/asan_abi.h
compiler-rt/lib/asan_abi/asan_abi_shim.cpp
Removed:
################################################################################
diff --git a/compiler-rt/lib/asan_abi/asan_abi.cpp b/compiler-rt/lib/asan_abi/asan_abi.cpp
index 769fde47a33b934..74efcb158bd1306 100644
--- a/compiler-rt/lib/asan_abi/asan_abi.cpp
+++ b/compiler-rt/lib/asan_abi/asan_abi.cpp
@@ -12,6 +12,10 @@ extern "C" {
// Functions concerning instrumented global variables:
void __asan_abi_register_image_globals(void) {}
void __asan_abi_unregister_image_globals(void) {}
+void __asan_abi_register_elf_globals(bool *flag, void *start, void *stop) {}
+void __asan_abi_unregister_elf_globals(bool *flag, void *start, void *stop) {}
+void __asan_abi_register_globals(void *globals, size_t n) {}
+void __asan_abi_unregister_globals(void *globals, size_t n) {}
// Functions concerning dynamic library initialization
void __asan_abi_before_dynamic_init(const char *module_name) {}
@@ -82,4 +86,22 @@ void *__asan_abi_stack_malloc_always_n(size_t scale, size_t size) {
// Functions concerning fake stack free
void __asan_abi_stack_free_n(int scale, void *p, size_t n) {}
+
+// Functions concerning introspection (including lldb support)
+void *__asan_abi_get_alloc_stack(void *addr, void **trace, size_t size,
+ int *thread_id) {
+ return NULL;
+}
+void __asan_abi_report_error(void *pc, void *bp, void *sp, void *addr,
+ bool is_write, size_t access_size, int exp) {}
+void __asan_abi_set_error_report_callback(void (*callback)(const char *)) {}
+void __asan_abi_describe_address(void *addr) {}
+bool __asan_abi_report_present(void) { return false; }
+void *__asan_abi_get_report_pc(void) { return NULL; }
+void *__asan_abi_get_report_bp(void) { return NULL; }
+void *__asan_abi_get_report_sp(void) { return NULL; }
+void *__asan_abi_get_report_address(void) { return NULL; }
+int __asan_abi_get_report_access_type(void) { return 0; }
+size_t __asan_abi_get_report_access_size(void) { return 0; }
+const char *__asan_abi_get_report_description(void) { return NULL; }
}
diff --git a/compiler-rt/lib/asan_abi/asan_abi.h b/compiler-rt/lib/asan_abi/asan_abi.h
index 562a552662b3cda..546af3822e50b27 100644
--- a/compiler-rt/lib/asan_abi/asan_abi.h
+++ b/compiler-rt/lib/asan_abi/asan_abi.h
@@ -11,12 +11,18 @@
#include <stdbool.h>
#include <stddef.h>
+#include <sys/cdefs.h>
#include <sys/types.h>
-extern "C" {
+__BEGIN_DECLS
+
// Functions concerning instrumented global variables:
void __asan_abi_register_image_globals();
void __asan_abi_unregister_image_globals();
+void __asan_abi_register_elf_globals(bool *flag, void *start, void *stop);
+void __asan_abi_unregister_elf_globals(bool *flag, void *start, void *stop);
+void __asan_abi_register_globals(void *globals, size_t n);
+void __asan_abi_unregister_globals(void *globals, size_t n);
// Functions concerning dynamic library initialization
void __asan_abi_before_dynamic_init(const char *module_name);
@@ -80,5 +86,22 @@ void *__asan_abi_stack_malloc_always_n(size_t scale, size_t size);
// Functions concerning fake stack free
void __asan_abi_stack_free_n(int scale, void *p, size_t n);
-}
+
+// Functions concerning introspection (including lldb support)
+void *__asan_abi_get_alloc_stack(void *addr, void **trace, size_t size,
+ int *thread_id);
+void __asan_abi_report_error(void *pc, void *bp, void *sp, void *addr,
+ bool is_write, size_t access_size, int exp);
+void __asan_abi_set_error_report_callback(void (*callback)(const char *));
+void __asan_abi_describe_address(void *addr);
+bool __asan_abi_report_present(void);
+void *__asan_abi_get_report_pc(void);
+void *__asan_abi_get_report_bp(void);
+void *__asan_abi_get_report_sp(void);
+void *__asan_abi_get_report_address(void);
+int __asan_abi_get_report_access_type(void);
+size_t __asan_abi_get_report_access_size(void);
+const char *__asan_abi_get_report_description(void);
+
+__END_DECLS
#endif // ASAN_ABI_H
diff --git a/compiler-rt/lib/asan_abi/asan_abi_shim.cpp b/compiler-rt/lib/asan_abi/asan_abi_shim.cpp
index 02cd778ba48d257..f039bf7c7f6d7f8 100644
--- a/compiler-rt/lib/asan_abi/asan_abi_shim.cpp
+++ b/compiler-rt/lib/asan_abi/asan_abi_shim.cpp
@@ -15,14 +15,25 @@ extern "C" {
void __asan_register_image_globals(uptr *flag) {
__asan_abi_register_image_globals();
}
-
void __asan_unregister_image_globals(uptr *flag) {
__asan_abi_unregister_image_globals();
}
-void __asan_register_elf_globals(uptr *flag, void *start, void *stop) {}
-void __asan_unregister_elf_globals(uptr *flag, void *start, void *stop) {}
-void __asan_register_globals(__asan_global *globals, uptr n) {}
-void __asan_unregister_globals(__asan_global *globals, uptr n) {}
+void __asan_register_elf_globals(uptr *flag, void *start, void *stop) {
+ bool bFlag = *flag;
+ __asan_abi_register_elf_globals(&bFlag, start, stop);
+ *flag = bFlag;
+}
+void __asan_unregister_elf_globals(uptr *flag, void *start, void *stop) {
+ bool bFlag = *flag;
+ __asan_abi_unregister_elf_globals(&bFlag, start, stop);
+ *flag = bFlag;
+}
+void __asan_register_globals(__asan_global *globals, uptr n) {
+ __asan_abi_register_globals(globals, n);
+}
+void __asan_unregister_globals(__asan_global *globals, uptr n) {
+ __asan_abi_unregister_globals(globals, n);
+}
// Functions concerning dynamic library initialization
void __asan_before_dynamic_init(const char *module_name) {
@@ -331,25 +342,28 @@ void __asan_unpoison_stack_memory(uptr addr, uptr size) {
}
// Functions concerning redzone poisoning
-void __asan_poison_intra_object_redzone(uptr p, uptr size) {}
-void __asan_unpoison_intra_object_redzone(uptr p, uptr size) {}
+void __asan_poison_intra_object_redzone(uptr p, uptr size) {
+ __asan_abi_poison_intra_object_redzone((void *)p, size);
+}
+void __asan_unpoison_intra_object_redzone(uptr p, uptr size) {
+ __asan_abi_unpoison_intra_object_redzone((void *)p, size);
+}
// Functions concerning array cookie poisoning
-void __asan_poison_cxx_array_cookie(uptr p) {}
+void __asan_poison_cxx_array_cookie(uptr p) {
+ __asan_abi_poison_cxx_array_cookie((void *)p);
+}
uptr __asan_load_cxx_array_cookie(uptr *p) {
- // TBD: Fail here
- return (uptr)0;
+ return (uptr)__asan_abi_load_cxx_array_cookie((void **)p);
}
// Functions concerning fake stacks
void *__asan_get_current_fake_stack(void) {
- // TBD: Fail here
- return (void *)0;
+ return __asan_abi_get_current_fake_stack();
}
void *__asan_addr_is_in_fake_stack(void *fake_stack, void *addr, void **beg,
void **end) {
- // TBD: Fail here
- return (void *)0;
+ return __asan_abi_addr_is_in_fake_stack(fake_stack, addr, beg, end);
}
// Functions concerning poisoning and unpoisoning fake stack alloca
@@ -467,19 +481,34 @@ void __asan_stack_free_10(uptr ptr, uptr size) {
// Functions concerning introspection (including lldb support)
uptr __asan_get_alloc_stack(uptr addr, uptr *trace, uptr size, u32 *thread_id) {
- // TBD: Fail here
- return (uptr)0;
+ return (uptr)__asan_abi_get_alloc_stack((void *)addr, (void **)trace,
+ (size_t)size, (int *)thread_id);
}
void __asan_report_error(uptr pc, uptr bp, uptr sp, uptr addr, int is_write,
- uptr access_size, u32 exp) {}
-void __asan_set_error_report_callback(void (*callback)(const char *)) {}
-void __asan_describe_address(uptr addr) {}
-int __asan_report_present(void) { return (int)0; }
-uptr __asan_get_report_pc(void) { return (uptr)0; }
-uptr __asan_get_report_bp(void) { return (uptr)0; }
-uptr __asan_get_report_sp(void) { return (uptr)0; }
-uptr __asan_get_report_address(void) { return (uptr)0; }
-int __asan_get_report_access_type(void) { return (int)0; }
-uptr __asan_get_report_access_size(void) { return (uptr)0; }
-const char *__asan_get_report_description(void) { return (const char *)0; }
+ uptr access_size, u32 exp) {
+ __asan_abi_report_error((void *)pc, (void *)bp, (void *)sp, (void *)addr,
+ (bool)is_write, (size_t)access_size, (int)exp);
+}
+void __asan_set_error_report_callback(void (*callback)(const char *)) {
+ __asan_abi_set_error_report_callback(callback);
+}
+void __asan_describe_address(uptr addr) {
+ __asan_abi_describe_address((void *)addr);
+}
+int __asan_report_present(void) { return __asan_abi_report_present(); }
+uptr __asan_get_report_pc(void) { return (uptr)__asan_abi_get_report_pc(); }
+uptr __asan_get_report_bp(void) { return (uptr)__asan_abi_get_report_bp(); }
+uptr __asan_get_report_sp(void) { return (uptr)__asan_abi_get_report_sp(); }
+uptr __asan_get_report_address(void) {
+ return (uptr)__asan_abi_get_report_address();
+}
+int __asan_get_report_access_type(void) {
+ return __asan_abi_get_report_access_type();
+}
+uptr __asan_get_report_access_size(void) {
+ return (uptr)__asan_abi_get_report_access_size();
+}
+const char *__asan_get_report_description(void) {
+ return __asan_abi_get_report_description();
+}
}
More information about the llvm-commits
mailing list