Handle symbol renaming of sigaction for NetBSD

[krytarowski]

Summary

NetBSD uses the __sigaction14 symbol name for historical and compat
reasons for the sigaction(2) function name.

Rename the interceptors and users of sigaction to sigaction_symname
and reuse it in the code base.

This change fixes 4 failing tests in TSan/NetBSD:

• ThreadSanitizer-x86_64 :: signal_errno.cc
• ThreadSanitizer-x86_64 :: signal_malloc.cc
• ThreadSanitizer-x86_64 :: signal_sync2.cc
• ThreadSanitizer-x86_64 :: signal_thread.cc

Sponsored by <The NetBSD Foundation>

[krytarowski]

This patch has been tested only on NetBSD and with asan, msan, lsan, tsan, ubsan, libfuzzer, safestack, profile.

I request for a tester on Linux as it might have impact for e.g. esan.

[dvyukov]

In D40341#932576, @krytarowski wrote:

This patch has been tested only on NetBSD and with asan, msan, lsan, tsan, ubsan, libfuzzer, safestack, profile.

I request for a tester on Linux as it might have impact for e.g. esan.

I've tested this patch on linux and all sanitizer tests have passed:

$ ninja check-tsan check-asan check-lsan check-msan check-esan check-sanitizer
[2/8] Running the LeakSanitizer tests
Testing Time: 9.29s
  Expected Passes    : 152
  Unsupported Tests  : 16
[3/8] Running sanitizer_common tests
Testing Time: 14.32s
  Expected Passes    : 701
  Expected Failures  : 34
  Unsupported Tests  : 55
[4/8] Running the AddressSanitizer tests
Testing Time: 31.81s
  Expected Passes    : 1471
  Expected Failures  : 2
  Unsupported Tests  : 297
[5/8] Running the MemorySanitizer tests
Testing Time: 6.58s
  Expected Passes    : 131
  Expected Failures  : 1
[6/8] Running ThreadSanitizer tests
Testing Time: 11.00s
  Expected Passes    : 303
  Expected Failures  : 1
  Unsupported Tests  : 75
2 warning(s) in tests.
[7/8] Running EfficiencySanitizer tests
Testing Time: 0.52s
  Expected Passes    : 10
  Unsupported Tests  : 3

[krytarowski]

Thanks! I've uploaded a slightly older diff, that has another renaming in sanitizer_signal_interceptors.inc. I will commit the newer version and check the remaining portability issues on buildbots.

@@ -25,7 +31,7 @@ using namespace __sanitizer;
 
 #ifndef SIGNAL_INTERCEPTOR_SIGACTION_IMPL
 #define SIGNAL_INTERCEPTOR_SIGACTION_IMPL(signum, act, oldact) \
-  { return REAL(sigaction)(signum, act, oldact); }
+  { return REAL(sigaction_symname)(signum, act, oldact); }
 #endif
 
 #if SANITIZER_INTERCEPT_BSD_SIGNAL

lib/sanitizer_common/sanitizer_signal_interceptors.inc

 #if SANITIZER_INTERCEPT_SIGNAL_AND_SIGACTION
 INTERCEPTOR(uptr, signal, int signum, uptr handler) {
   if (GetHandleSignalMode(signum) == kHandleSignalExclusive)
     return (uptr) nullptr;
   SIGNAL_INTERCEPTOR_SIGNAL_IMPL(signal, signum, handler);
 }
 #define INIT_SIGNAL COMMON_INTERCEPT_FUNCTION(signal)
 
-INTERCEPTOR(int, sigaction, int signum, const __sanitizer_sigaction *act,
-            __sanitizer_sigaction *oldact) {
+#if SANITIZER_NETBSD
+#define sigaction_symname __sigaction14
+#else
+#define sigaction_symname sigaction
+#endif
+
+INTERCEPTOR(int, sigaction_symname, int signum,
+            const __sanitizer_sigaction *act, __sanitizer_sigaction *oldact) {
   if (GetHandleSignalMode(signum) == kHandleSignalExclusive) return 0;
   SIGNAL_INTERCEPTOR_SIGACTION_IMPL(signum, act, oldact);
 }
-#define INIT_SIGACTION COMMON_INTERCEPT_FUNCTION(sigaction)
+#define INIT_SIGACTION COMMON_INTERCEPT_FUNCTION(sigaction_symname)
 
 namespace __sanitizer {
 int real_sigaction(int signum, const void *act, void *oldact) {
-  return REAL(sigaction)(signum, (const __sanitizer_sigaction *)act,
+  return REAL(sigaction_symname)(signum, (const __sanitizer_sigaction *)act,
                          (__sanitizer_sigaction *)oldact);
 }
 }  // namespace __sanitizer
 #else  // SANITIZER_INTERCEPT_SIGNAL_AND_SIGACTION
 #define INIT_SIGNAL
 #define INIT_SIGACTION
 // We need to have defined REAL(sigaction) on other systems.
 namespace __sanitizer {

lib/tsan/rtl/tsan_interceptors.cc

 
 static __sanitizer_sighandler_ptr signal_impl(int sig,
                                               __sanitizer_sighandler_ptr h) {
   __sanitizer_sigaction act;
   act.handler = h;
   internal_memset(&act.sa_mask, -1, sizeof(act.sa_mask));
   act.sa_flags = 0;
   __sanitizer_sigaction old;
-  int res = sigaction(sig, &act, &old);
+  int res = sigaction_symname(sig, &act, &old);
   if (res) return (__sanitizer_sighandler_ptr)sig_err;
   return old.handler;
 }
 
 #define TSAN_SYSCALL() \
   ThreadState *thr = cur_thread(); \
   if (thr->ignore_interceptors) \
     return; \