tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Plumb scudo_stack_depot_size to debuggerd_process_info" into main

Browse source
This commit is contained in:
Florian Mayer 2023-12-11 23:38:13 +00:00 committed by Gerrit Code Review
commit 7fdb49f129
3 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libc/bionic/malloc_common_dynamic.cpp
View file

@ -372,6 +372,7 @@ extern "C" const char* __scudo_get_stack_depot_addr();
extern "C" const char* __scudo_get_region_info_addr();
extern "C" const char* __scudo_get_ring_buffer_addr();
extern "C" size_t __scudo_get_ring_buffer_size();
extern "C" size_t __scudo_get_stack_depot_size();
// Initializes memory allocation framework once per process.
static void MallocInitImpl(libc_globals* globals) {
@ -385,6 +386,7 @@ static void MallocInitImpl(libc_globals* globals) {
__libc_shared_globals()->scudo_region_info = __scudo_get_region_info_addr();
__libc_shared_globals()->scudo_ring_buffer = __scudo_get_ring_buffer_addr();
__libc_shared_globals()->scudo_ring_buffer_size = __scudo_get_ring_buffer_size();
__libc_shared_globals()->scudo_stack_depot_size = __scudo_get_stack_depot_size();
#endif
// Prefer malloc debug since it existed first and is a more complete

1
libc/private/bionic_globals.h
View file

@ -130,6 +130,7 @@ struct libc_shared_globals {
const char* scudo_region_info = nullptr;
const char* scudo_ring_buffer = nullptr;
size_t scudo_ring_buffer_size = 0;
size_t scudo_stack_depot_size = 0;
HeapTaggingLevel initial_heap_tagging_level = M_HEAP_TAGGING_LEVEL_NONE;
bool initial_memtag_stack = false;

1
linker/linker_debuggerd_android.cpp
View file

@ -44,6 +44,7 @@ static debugger_process_info get_process_info() {
.scudo_region_info = __libc_shared_globals()->scudo_region_info,
.scudo_ring_buffer = __libc_shared_globals()->scudo_ring_buffer,
.scudo_ring_buffer_size = __libc_shared_globals()->scudo_ring_buffer_size,
.scudo_stack_depot_size = __libc_shared_globals()->scudo_stack_depot_size,
};
}