commit c138f81e4b96c8c2ecbd43b4137a37efe75ee2b3
author Florian Mayer <fmayer@google.com> Tue Oct 29 15:26:13 2024 -0700
committer Florian Mayer <fmayer@google.com> Thu Oct 31 14:11:38 2024 -0700
tree ec527d21d3b4bda0b5b9c6e2f3bc1f1b160ed9fe
parent 3e56e562a535d934ec624dae69487cd0522716cf

[MTE] split heap and stack MTE initialization

Bug: 315182011
Test: On both an MTE-enabled and non-MTE-enabled device:
Test: atest libprocinfo_test bionic-unit-tests bionic-unit-tests-static CtsGwpAsanTestCases gwp_asan_unittest debuggerd_test memtag_stack_dlopen_test
Change-Id: Idaacce32eb7c569237714171e96dc7392c565983

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index fe7d348..227b599 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -1720,7 +1720,7 @@
     } else {
       // find_library is used by the initial linking step, so we communicate that we
       // want memtag_stack enabled to __libc_init_mte.
-      __libc_shared_globals()->initial_memtag_stack = true;
+      __libc_shared_globals()->initial_memtag_stack_abi = true;
     }
   }