summaryrefslogtreecommitdiff
path: root/libc
diff options
context:
space:
mode:
authorPeter Collingbourne <pcc@google.com>2021-02-23 13:18:03 -0800
committerPeter Collingbourne <pcc@google.com>2021-02-23 13:18:03 -0800
commitbf917866f530ffdce19df1e1fe4c7b258c27a15e (patch)
tree8634f1f5b06ef0cc2e88d0a1555c777cd208d3c1 /libc
parent15ade069b10f7f5291e48c01db2da4852dae04b7 (diff)
Make __libc_init_scudo() weak for native bridge.
__libc_init_scudo() calls directly into the allocator, bypassing the normal guest to host transition in the native bridge. Therefore we need to let the native bridge override it with a no-op. Bug: 159352723 Change-Id: I642c7a058e483cc09335290f66b9c053150fca06
Diffstat (limited to 'libc')
-rw-r--r--libc/bionic/libc_init_common.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/libc/bionic/libc_init_common.cpp b/libc/bionic/libc_init_common.cpp
index 01cd2e591..a710fa826 100644
--- a/libc/bionic/libc_init_common.cpp
+++ b/libc/bionic/libc_init_common.cpp
@@ -86,6 +86,7 @@ static void arc4random_fork_handler() {
_thread_arc4_lock();
}
+__BIONIC_WEAK_FOR_NATIVE_BRIDGE
void __libc_init_scudo() {
// Heap tagging level *must* be set before interacting with Scudo, otherwise
// the primary will be mapped with PROT_MTE even if MTE is is not enabled in