Fix the waitid sanitizer interceptor to work on FreeBSD in 32-bit mode

[emaste]

lib/sanitizer_common/sanitizer_common_interceptors.inc

1545

Do you mind submitting a FreeBSD bug for this? It's quite a silly issue to have to work around.

It will be hard to change, but having a cross-reference between a comment here and a FreeBSD PR will simplify the update when/if we make a change in FreeBSD - for example, a __FreeBSD_version < 11000000 test may be the sol'n in the future.

[samsonov]

LGTM

[kutuzov.viktor.84]

Closed by commit rL214543 (authored by vkutuzov).

lib/sanitizer_common/sanitizer_common_interceptors.inc

INTERCEPTOR_WITH_SUFFIX(int, wait, int *status) {
   // FIXME: under ASan the call below may write to freed memory and corrupt
   // its metadata. See
   // https://code.google.com/p/address-sanitizer/issues/detail?id=321.
   int res = REAL(wait)(status);
   if (res != -1 && status)
     COMMON_INTERCEPTOR_WRITE_RANGE(ctx, status, sizeof(*status));
   return res;
 }
+// On FreeBSD id_t is always 64-bit wide.
+#if SANITIZER_FREEBSD && (SANITIZER_WORDSIZE == 32)
+INTERCEPTOR_WITH_SUFFIX(int, waitid, int idtype, long long id, void *infop,
+                        int options) {
+#else
 INTERCEPTOR_WITH_SUFFIX(int, waitid, int idtype, int id, void *infop,
                         int options) {
+#endif
   void *ctx;
   COMMON_INTERCEPTOR_ENTER(ctx, waitid, idtype, id, infop, options);
   // FIXME: under ASan the call below may write to freed memory and corrupt
   // its metadata. See
   // https://code.google.com/p/address-sanitizer/issues/detail?id=321.
   int res = REAL(waitid)(idtype, id, infop, options);
   if (res != -1 && infop)
     COMMON_INTERCEPTOR_WRITE_RANGE(ctx, infop, siginfo_t_sz);