commit e704fd094307a363c42b2ccbdb9bca5af22afc61
author Peter Collingbourne <pcc@google.com> Wed Mar 22 23:41:58 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 22 23:41:58 2023 +0000
tree c60f8f1de16990fc7066df590781683f4739330d
parent 90d78460a9af193d578a20484993629d700b65bf
parent 523b53fba97953873a9760af51cfb4a7067aff58

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

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

Change-Id: I8a692cd3c0105aa5523cbaef0bc516255cddd213
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*) {