| commit | 755f4828a312a674205282a23c4b3a7593c9f935 | [log] [tgz] |
|---|---|---|
| author | Florian Mayer <fmayer@google.com> | Mon Jun 24 20:01:04 2024 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Jun 24 20:01:04 2024 +0000 |
| tree | 43374f817d686c068cb93f7edd6b766dde42b613 | |
| parent | 3e9f66b263bbe54309469b64aacd2531e8bcc788 [diff] | |
| parent | 6b174efa140304f857547e3058baff445dd2f17f [diff] |
Merge "[MTE] fix longjmp handling" into main
diff --git a/libc/bionic/heap_tagging.cpp b/libc/bionic/heap_tagging.cpp index cadab3c..3d92404 100644 --- a/libc/bionic/heap_tagging.cpp +++ b/libc/bionic/heap_tagging.cpp
@@ -184,6 +184,9 @@ #ifdef __aarch64__ static inline __attribute__((no_sanitize("memtag"))) void untag_memory(void* from, void* to) { + if (from == to) { + return; + } __asm__ __volatile__( ".arch_extension mte\n" "1:\n"