[asan] Also allow for SIGBUS in high-address-dereference.c

[arichardson]

Summary

FreeBSD delivers a SIGBUS signal for bad addresses rather than SIGSEGV.

[yln]

compiler-rt/lib/sanitizer_common/sanitizer_posix.cpp

296

Quick question: should the SIGBUS part be behind a #ifdef for FreeBSD to limit unwanted interactions?

[arichardson]

compiler-rt/lib/sanitizer_common/sanitizer_posix.cpp

296

I could split this out, but as far as I am aware SIGBUS is only ever raise for memory acceses (e.g. unaligned loads/stores).

[yln]

LGTM, thanks!
I still would feel more comfortable to get a second opinion. Maybe @vitalybuka can comment?

compiler-rt/lib/sanitizer_common/sanitizer_posix.cpp

 
 uptr SignalContext::GetAddress() const {
   auto si = static_cast<const siginfo_t *>(siginfo);
   return (uptr)si->si_addr;
 }
 
 bool SignalContext::IsMemoryAccess() const {
   auto si = static_cast<const siginfo_t *>(siginfo);
-  return si->si_signo == SIGSEGV;
+  return si->si_signo == SIGSEGV || si->si_signo == SIGBUS;
 }
 
 int SignalContext::GetType() const {
   return static_cast<const siginfo_t *>(siginfo)->si_signo;
 }
 
 const char *SignalContext::Describe() const {
   switch (GetType()) {

compiler-rt/test/asan/TestCases/Posix/high-address-dereference.c

int main(int argc, const char *argv[]) {
   uint64_t *addr = (uint64_t *)strtoull(hex, NULL, 16);
   uint64_t x = *addr;  // segmentation fault
   return x;
 }
 
 // ZERO:  SEGV on unknown address 0x000000000000 (pc
 // LOW1:  SEGV on unknown address 0x000000000fff (pc
 // LOW2:  SEGV on unknown address 0x000000001000 (pc
-// HIGH:  SEGV on unknown address (pc
-// MAX:   SEGV on unknown address (pc
+// HIGH:  {{BUS|SEGV}} on unknown address (pc
+// MAX:   {{BUS|SEGV}} on unknown address (pc
 
 // HINT-PAGE0-NOT: Hint: this fault was caused by a dereference of a high value address
 // HINT-PAGE0:     Hint: address points to the zero page.
 
 // HINT-NONE-NOT:  Hint: this fault was caused by a dereference of a high value address
 // HINT-NONE-NOT:  Hint: address points to the zero page.
 
 // HINT-HIGHADDR:     Hint: this fault was caused by a dereference of a high value address
 // HINT-HIGHADDR-NOT: Hint: address points to the zero page.
 
 // ZERO:  SCARINESS: 10 (null-deref)
 // LOW1:  SCARINESS: 10 (null-deref)
 // LOW2:  SCARINESS: 20 (wild-addr-read)
-// HIGH:  SCARINESS: 20 (wild-addr-read)
-// MAX:   SCARINESS: 20 (wild-addr-read)
+// HIGH:  SCARINESS: {{(20 \(wild-addr-read\))|(60 \(wild-jump\))}}
+// MAX:   SCARINESS: {{(20 \(wild-addr-read\))|(60 \(wild-jump\))}}
 
 // TODO: Currently, register values are only printed on Mac.  Once this changes,
 //       remove the 'TODO_' prefix in the following lines.
 // TODO_HIGH,TODO_MAX: Register values:
 // TODO_HIGH: = 0x4141414141414141
 // TODO_MAX:  = 0xffffffffffffffff