commit 38dadd12253c82c78be24de684c5ec8834801795
author Elliott Hughes <enh@google.com> Fri Feb 02 21:12:29 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 02 21:12:29 2024 +0000
tree d59d4b85fb4e65e48e01ed234897f13330e833a4
parent 8e631624e9da603e023abe049820eaa830d02815
parent 6034df4abd2e036c8ee5aceee15cb365acf801de

Merge "Remove libc_ndk." into main

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index 3529a2e..d04907b 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -92,6 +92,7 @@
         "crtbegin_so",
         "crtend_android",
         "crtend_so",
+        "crt_pad_segment",
     ],
 }
 

libc/bionic/heap_tagging.cpp

diff --git a/libc/bionic/heap_tagging.cpp b/libc/bionic/heap_tagging.cpp
index 230899a..48ec955 100644
--- a/libc/bionic/heap_tagging.cpp
+++ b/libc/bionic/heap_tagging.cpp
@@ -90,10 +90,7 @@
         }
 
         tagged_addr_ctrl = (tagged_addr_ctrl & ~PR_MTE_TCF_MASK) | tcf;
-        if (prctl(PR_SET_TAGGED_ADDR_CTRL, tagged_addr_ctrl, 0, 0, 0) < 0) {
-          return false;
-        }
-        return true;
+        return prctl(PR_SET_TAGGED_ADDR_CTRL, tagged_addr_ctrl, 0, 0, 0) >= 0;
       },
       &tcf);
 }