commit da1bc79f937225b1a048d9e5a03eca81680a17fd
author Peter Collingbourne <pcc@google.com> Thu Sep 06 22:20:44 2018 -0700
committer Elliott Hughes <enh@google.com> Mon Oct 29 19:55:18 2018 +0000
tree 0334b394fff71fc1263d82515dde5c8c16a5dda8
parent c89a3971e94c30611c885e4c440eae2fd9937948

bionic: Allocate a shadow call stack for each thread.

Bug: 112907825
Change-Id: I7c1479a0cd68696739bf6aa5e0700ba4f2a137ec
Merged-In: I7c1479a0cd68696739bf6aa5e0700ba4f2a137ec

libc/bionic/pthread_exit.cpp

diff --git a/libc/bionic/pthread_exit.cpp b/libc/bionic/pthread_exit.cpp
index 220f7a0..010cc06 100644
--- a/libc/bionic/pthread_exit.cpp
+++ b/libc/bionic/pthread_exit.cpp
@@ -103,6 +103,11 @@
     thread->alternate_signal_stack = nullptr;
   }
 
+#ifdef __aarch64__
+  // Free the shadow call stack and guard pages.
+  munmap(thread->shadow_call_stack_guard_region, SCS_GUARD_REGION_SIZE);
+#endif
+
   ThreadJoinState old_state = THREAD_NOT_JOINED;
   while (old_state == THREAD_NOT_JOINED &&
          !atomic_compare_exchange_weak(&thread->join_state, &old_state, THREAD_EXITED_NOT_JOINED)) {