Skip to content

[ubsan_minimal] Add address argument to Android's abort message function #152419

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

Merged
merged 4 commits into from
Aug 7, 2025
Merged

[ubsan_minimal] Add address argument to Android's abort message function #152419

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eea59e2
[ubsan_minimal] Add address argument to Android's abort message function
Sharjeel-Khan Aug 7, 2025
d92151e
Clang Format fix
Sharjeel-Khan Aug 7, 2025
222c407
Actual Clang Format fix
Sharjeel-Khan Aug 7, 2025
ef38789
Merge branch 'main' into ubsan-fix
vitalybuka Aug 7, 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
14 changes: 9 additions & 5 deletions compiler-rt/lib/ubsan_minimal/ubsan_minimal_handlers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,19 @@ SANITIZER_INTERFACE_WEAK_DEF(void, __ubsan_report_error_fatal, const char *kind,

#if defined(__ANDROID__)
extern "C" __attribute__((weak)) void android_set_abort_message(const char *);
static void abort_with_message(const char *kind, uintptr_t caller) {
static void abort_with_message(const char *kind, uintptr_t caller,
const uintptr_t *address) {
char msg_buf[128];
format_msg(kind, caller, msg_buf, msg_buf + sizeof(msg_buf));
format_msg(kind, caller, address, msg_buf, msg_buf + sizeof(msg_buf));
if (&android_set_abort_message)
android_set_abort_message(msg_buf);
abort();
}
#else
static void abort_with_message(const char *kind, uintptr_t caller) { abort(); }
static void abort_with_message(const char *kind, uintptr_t caller,
const uintptr_t *address) {
abort();
}
#endif

#if SANITIZER_DEBUG
Expand All @@ -132,7 +136,7 @@ void NORETURN CheckFailed(const char *file, int, const char *cond, u64, u64) {
INTERFACE void __ubsan_handle_##name##_minimal_abort() { \
uintptr_t caller = GET_CALLER_PC(); \
__ubsan_report_error_fatal(kind, caller, nullptr); \
abort_with_message(kind, caller); \
abort_with_message(kind, caller, nullptr); \
}

#define HANDLER(name, kind) \
Expand All @@ -149,7 +153,7 @@ void NORETURN CheckFailed(const char *file, int, const char *cond, u64, u64) {
const uintptr_t address) { \
uintptr_t caller = GET_CALLER_PC(); \
__ubsan_report_error_fatal(kind, caller, &address); \
abort_with_message(kind, caller); \
abort_with_message(kind, caller, &address); \
}

// A version of a handler that takes a pointer to a value.
Expand Down
Loading