commit a34a37defaabfdfc38df0d6b7f1378b5dbfe3c7d
author Peter Collingbourne <pcc@google.com> Wed Mar 22 22:19:46 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 22 22:19:46 2023 +0000
tree 7573e929a064b13a30d04a723cef6803a854334d
parent a53c65012249d4aa2a88d8f20d3ef594867bbd28
parent 85a7f6b391e7ca4ed79bbee44867f44d5fdc6193

Merge "Disable stack tagging in CloneStartRoutine." am: 85a7f6b391

Original change: https://android-review.googlesource.com/c/platform/bionic/+/2501675

Change-Id: I14dec7fbf97666a86ee721b1566ece1ae6e00fcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tests/unistd_test.cpp

diff --git a/tests/unistd_test.cpp b/tests/unistd_test.cpp
index 2a36460..4c21627 100644
--- a/tests/unistd_test.cpp
+++ b/tests/unistd_test.cpp
@@ -589,9 +589,10 @@
   TestGetTidCachingWithFork(CloneAndSetTid, exit);
 }
 
+__attribute__((no_sanitize("hwaddress", "memtag")))
 static int CloneStartRoutine(int (*start_routine)(void*)) {
   void* child_stack[1024];
-  return clone(start_routine, untag_address(&child_stack[1024]), SIGCHLD, nullptr);
+  return clone(start_routine, &child_stack[1024], SIGCHLD, nullptr);
 }
 
 static int GetPidCachingCloneStartRoutine(void*) {