diff options
| author | Evgenii Stepanov <eugenis@google.com> | 2021-01-07 03:43:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-01-07 03:43:52 +0000 |
| commit | e09fc24a94c1a196b8930f8f26c6f5f8c1a47d06 (patch) | |
| tree | d57d36117763936f8663395e17e51172497af7b2 /libc/bionic/libc_init_common.cpp | |
| parent | 286b3d4b8ce9506e8ee851dd124b1ec312c2c46d (diff) | |
| parent | 8564b8d9e61580bef3bd5018cf63e37c78e40053 (diff) | |
Merge "Use ELF notes to set the desired memory tagging level."
Diffstat (limited to 'libc/bionic/libc_init_common.cpp')
| -rw-r--r-- | libc/bionic/libc_init_common.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libc/bionic/libc_init_common.cpp b/libc/bionic/libc_init_common.cpp index 80adbbe8e..f2c3f1c68 100644 --- a/libc/bionic/libc_init_common.cpp +++ b/libc/bionic/libc_init_common.cpp @@ -86,7 +86,7 @@ static void arc4random_fork_handler() { _thread_arc4_lock(); } -static void __libc_init_malloc_fill_contents() { +void __libc_init_scudo() { // TODO(b/158870657) make this unconditional when all devices support SCUDO. #if defined(USE_SCUDO) #if defined(SCUDO_PATTERN_FILL_CONTENTS) @@ -95,6 +95,7 @@ static void __libc_init_malloc_fill_contents() { scudo_malloc_set_zero_contents(1); #endif #endif + SetDefaultHeapTaggingLevel(); } __BIONIC_WEAK_FOR_NATIVE_BRIDGE @@ -119,9 +120,6 @@ void __libc_init_common() { __system_properties_init(); // Requires 'environ'. __libc_init_fdsan(); // Requires system properties (for debug.fdsan). __libc_init_fdtrack(); - - __libc_init_malloc_fill_contents(); - SetDefaultHeapTaggingLevel(); } void __libc_init_fork_handler() { |