Handle NetBSD symbol renaming in msan_interceptors.cc

[krytarowski]

Summary

NetBSD renames symbols for historical and compat reasons.

Add required symbol renames in sanitizer_common_interceptors.inc:

• gettimeofday -> __gettimeofday50
• getrusage -> __getrusage50
• shmctl -> __shmctl50

Additionally handle sigaction symbol mangling.
Rename the function symbol in the file to SIGACTION_SYMNAME and define
it as __sigaction14 for NetBSD and sigaction for !NetBSD. We cannot use
simple renaming with the proprocessor, as there are valid fields named
sigaction and they must be left intact.

Sponsored by <The NetBSD Foundation>

[vitalybuka]

lib/msan/msan_interceptors.cc

47

Why not the same for __libc_thr_keycreate?

[krytarowski]

lib/msan/msan_interceptors.cc

47

This one we are not intercepting here, but calling with REAL(). We need to use a 3rd party symbol name in order to not mangle too much, as there are struct fields named 'sigaction'.

[vitalybuka]

lib/msan/msan_interceptors.cc

47

could you please use all capitals in macro names for consistency?

maybe better place for this macros is
sanitizer_platform_limits_netbsd.h and sanitizer_platform_limits_posix.h

[krytarowski]

lib/msan/msan_interceptors.cc

47

could you please use all capitals in macro names for consistency?

Do you mean SIGACTION_SYMNAME?

[vitalybuka]

lib/msan/msan_interceptors.cc

47

yes

[krytarowski]

• rename sigaction_symname to SIGACTION_SYMNAME
• put SIGACTION_SYMNAME in sanitizer_common/sanitizer_platform_limits_posix.h and ..netbsd.h

[vitalybuka]

lib/msan/msan_interceptors.cc

37

I expected you remove these too. However looks like we do the same in sanitizer_common_interceptors.inc

shmctl50 already defined there. Could you just delete "#define shmctl shmctl50" and "DECLARE_REAL(int, shmctl, int shmid, int cmd, void *buf)"
and move "INTERCEPTOR(void *, shmat" to just before "INTERCEPTOR(int, dl_iterate_phdr", after sanitizer_common_interceptors.inc ?

lib/sanitizer_common/sanitizer_platform_limits_netbsd.h

579 ↗

(On Diff #125664)

So we don't remove gettimeofday ang getrusage, maybe we could return this back. It's up to you.

[krytarowski]

lib/msan/msan_interceptors.cc

37

It's not clear to me. shmctl is used in the shmat interceptor.

[vitalybuka]

lib/msan/msan_interceptors.cc

37

Correct. You just need to move shmat interceptor after "#include sanitizer_common_interceptors.inc"
sanitizer_common_interceptors.inc already declares READ(shmctl)

[krytarowski]

Apply changes from review.

[krytarowski]

I think it's done now.

[vitalybuka]

lgtm

lib/msan/msan_interceptors.cc

 #include "sanitizer_common/sanitizer_common.h"
 #include "sanitizer_common/sanitizer_errno.h"
 #include "sanitizer_common/sanitizer_stackdepot.h"
 #include "sanitizer_common/sanitizer_libc.h"
 #include "sanitizer_common/sanitizer_linux.h"
 #include "sanitizer_common/sanitizer_tls_get_addr.h"
 
 #include <stdarg.h>
 // ACHTUNG! No other system header includes in this file.
 // Ideally, we should get rid of stdarg.h as well.
 
+#if SANITIZER_NETBSD
+#define gettimeofday __gettimeofday50
+#define getrusage __getrusage50
+#define shmctl __shmctl50
+#endif
+
+#if SANITIZER_NETBSD
+#define sigaction_symname __sigaction14
+#else
+#define sigaction_symname sigaction
+#endif
+
 using namespace __msan;
 
 using __sanitizer::memory_order;
 using __sanitizer::atomic_load;
 using __sanitizer::atomic_store;
 using __sanitizer::atomic_uintptr_t;
 
 DECLARE_REAL(SIZE_T, strlen, const char *s)