[hwasan] Call user provided callback function for both fatal and non-…

[Enna1]

…fatal error report

This makes the behavior of HWASan matching with ASan: always call user provided callback function for an error report, but only call SetAbortMessage() on Android when flags()->halt_on_error is true.

[llvmbot]

@llvm/pr-subscribers-compiler-rt-sanitizer

Author: Enna1 (Enna1)

Changes

…fatal error report

---

Full diff: https://github.com/llvm/llvm-project/pull/80429.diff

1 Files Affected:

• (modified) compiler-rt/lib/hwasan/hwasan_report.cpp (+1-1)

diff --git a/compiler-rt/lib/hwasan/hwasan_report.cpp b/compiler-rt/lib/hwasan/hwasan_report.cpp
index 12a4fa47f2151..54bf8247ceeb3 100644
--- a/compiler-rt/lib/hwasan/hwasan_report.cpp
+++ b/compiler-rt/lib/hwasan/hwasan_report.cpp
@@ -40,7 +40,7 @@ class ScopedReport {
  public:
   explicit ScopedReport(bool fatal) : fatal(fatal) {
     Lock lock(&error_message_lock_);
-    error_message_ptr_ = fatal ? &error_message_ : nullptr;
+    error_message_ptr_ = &error_message_;
     ++hwasan_report_count;
   }
 

[fmayer]

tbh I am not sure who uses this API, so I am not sure if this behavior change could cause any problems

[Enna1]

tbh I am not sure who uses this API, so I am not sure if this behavior change could cause any problems

Thanks for the review!

This change makes the behavior of hwasan matching with asan.
https://github.com/llvm/llvm-project/blob/main/compiler-rt/lib/asan/asan_report.cpp#L173-L183
Always call user provided callback function for an error report, but only call android_set_abort_message() on Android when flags()->halt_on_error is true.

In my use case, I collect every error report text and upload it to storage using __hwasan_set_error_report_callback():)

[fmayer]

Please add "match ASan behavior" or something in the commit description.