Skip to content

[compiler-rt] [Darwin] Strip MTE tags from ASAN and TSAN #166453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[compiler-rt] [Darwin] Strip MTE tags from ASAN and TSAN #166453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a69c60
[compiler-rt] Strip MTE tags from ASAN and TSAN
ndrewh Nov 4, 2025
09d783e
STRIP_TAG => STRIP_MTE_TAG, move to common
ndrewh Nov 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion compiler-rt/lib/asan/asan_mapping.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ extern uptr kHighMemEnd, kMidMemBeg, kMidMemEnd; // Initialized in __asan_init.
# include "asan_mapping_sparc64.h"
# else
# define MEM_TO_SHADOW(mem) \
(((mem) >> ASAN_SHADOW_SCALE) + (ASAN_SHADOW_OFFSET))
((STRIP_MTE_TAG(mem) >> ASAN_SHADOW_SCALE) + (ASAN_SHADOW_OFFSET))
# define SHADOW_TO_MEM(mem) \
(((mem) - (ASAN_SHADOW_OFFSET)) << (ASAN_SHADOW_SCALE))

Expand Down Expand Up @@ -377,6 +377,7 @@ static inline uptr MemToShadowSize(uptr size) {

static inline bool AddrIsInMem(uptr a) {
PROFILE_ASAN_MAPPING();
a = STRIP_MTE_TAG(a);
return AddrIsInLowMem(a) || AddrIsInMidMem(a) || AddrIsInHighMem(a) ||
(flags()->protect_shadow_gap == 0 && AddrIsInShadowGap(a));
}
Expand All @@ -389,6 +390,7 @@ static inline uptr MemToShadow(uptr p) {

static inline bool AddrIsInShadow(uptr a) {
PROFILE_ASAN_MAPPING();
a = STRIP_MTE_TAG(a);
return AddrIsInLowShadow(a) || AddrIsInMidShadow(a) || AddrIsInHighShadow(a);
}

Expand Down
7 changes: 7 additions & 0 deletions compiler-rt/lib/sanitizer_common/sanitizer_platform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,4 +497,11 @@
# endif
#endif

#if SANITIZER_APPLE && SANITIZER_WORDSIZE == 64
// MTE uses the lower half of the top byte.
# define STRIP_MTE_TAG(addr) ((addr) & ~((uptr)0x0f << 56))
#else
# define STRIP_MTE_TAG(addr) (addr)
#endif

#endif // SANITIZER_PLATFORM_H
11 changes: 8 additions & 3 deletions compiler-rt/lib/tsan/rtl/tsan_platform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,9 @@ struct IsAppMemImpl {
};

ALWAYS_INLINE
bool IsAppMem(uptr mem) { return SelectMapping<IsAppMemImpl>(mem); }
bool IsAppMem(uptr mem) {
return SelectMapping<IsAppMemImpl>(STRIP_MTE_TAG(mem));
}

struct IsShadowMemImpl {
template <typename Mapping>
Expand Down Expand Up @@ -997,7 +999,8 @@ struct MemToShadowImpl {

ALWAYS_INLINE
RawShadow *MemToShadow(uptr x) {
return reinterpret_cast<RawShadow *>(SelectMapping<MemToShadowImpl>(x));
return reinterpret_cast<RawShadow*>(
SelectMapping<MemToShadowImpl>(STRIP_MTE_TAG(x)));
}

struct MemToMetaImpl {
Expand All @@ -1011,7 +1014,9 @@ struct MemToMetaImpl {
};

ALWAYS_INLINE
u32 *MemToMeta(uptr x) { return SelectMapping<MemToMetaImpl>(x); }
u32* MemToMeta(uptr x) {
return SelectMapping<MemToMetaImpl>(STRIP_MTE_TAG(x));
}

struct ShadowToMemImpl {
template <typename Mapping>
Expand Down