$NetBSD$
---- lib/sanitizer_common/sanitizer_linux.cc.orig 2018-08-31 08:13:43.281423466 +0000
+--- lib/sanitizer_common/sanitizer_linux.cc.orig 2018-08-31 08:32:18.000000000 +0000
+++ lib/sanitizer_common/sanitizer_linux.cc
-@@ -158,7 +158,20 @@ extern void internal_sigreturn();
- # else
- # define SANITIZER_USE_GETENTROPY 0
+@@ -160,6 +160,32 @@ extern void internal_sigreturn();
# endif
--#endif // SANITIZER_USE_GETENTROPY
-+#endif // SANITIZER_USE_GETENTROP
-+
+ #endif // SANITIZER_USE_GETENTROPY
+
+#if SANITIZER_NETBSD
-+//#include "interception/interception.h"
-+#if 0
-+DECLARE_REAL(void *, __mmap, void *addr, size_t length, int prot, \
-+int flags, int fd, int pad, off_t offset);
-+#endif
-+#if 0
-+extern "C" void *__mmap(void *, size_t, int, int, int, int, off_t);
-+DEFINE_REAL(void *, __mmap, void *addr, size_t length, int prot, \
-+int flags, int fd, int pad, off_t offset)
++extern "C" void *__mmap(void *, size_t, int, int, int, int,
++ off_t) SANITIZER_WEAK_ATTRIBUTE;
++extern "C" int __sysctl(const int *, unsigned int, void *, size_t *,
++ const void *, size_t) SANITIZER_WEAK_ATTRIBUTE;
++extern "C" int _sys_close(int) SANITIZER_WEAK_ATTRIBUTE;
++extern "C" int _sys_open(const char *, int, ...) SANITIZER_WEAK_ATTRIBUTE;
++extern "C" ssize_t _sys_read(int, void *, size_t) SANITIZER_WEAK_ATTRIBUTE;
++extern "C" ssize_t _sys_write(int, const void *,
++ size_t) SANITIZER_WEAK_ATTRIBUTE;
++extern "C" int __ftruncate(int, int, off_t) SANITIZER_WEAK_ATTRIBUTE;
++extern "C" ssize_t _sys_readlink(const char *, char *,
++ size_t) SANITIZER_WEAK_ATTRIBUTE;
++extern "C" int _sys_sched_yield() SANITIZER_WEAK_ATTRIBUTE;
++extern "C" int _sys___nanosleep50(const void *,
++ void *) SANITIZER_WEAK_ATTRIBUTE;
++extern "C" int _sys_execve(const char *, char *const[],
++ char *const[]) SANITIZER_WEAK_ATTRIBUTE;
++extern "C" off_t __lseek(int, int, off_t, int) SANITIZER_WEAK_ATTRIBUTE;
++extern "C" int __fork() SANITIZER_WEAK_ATTRIBUTE;
++extern "C" int _sys___sigprocmask14(int, const void *,
++ void *) SANITIZER_WEAK_ATTRIBUTE;
++extern "C" int _sys___wait450(int wpid, int *, int,
++ void *) SANITIZER_WEAK_ATTRIBUTE;
+#endif
-+#endif
-
++
namespace __sanitizer {
-@@ -172,12 +185,37 @@ namespace __sanitizer {
+ #if SANITIZER_LINUX && defined(__x86_64__)
+@@ -172,14 +198,27 @@ namespace __sanitizer {
#include "sanitizer_syscall_generic.inc"
#endif
#if !SANITIZER_S390 && !SANITIZER_OPENBSD
uptr internal_mmap(void *addr, uptr length, int prot, int flags, int fd,
OFF_T offset) {
--#if SANITIZER_NETBSD
-+#if SANITIZER_NETBSDxx
-+ GetRealFunctionAddress();
-+ return (uptr)REAL(__mmap)(addr, length, prot, flags, fd, 0, offset);
-+#elif SANITIZER_NETBSD
-+ static uptr (*real___mmap)(void *a, uptr b, int c, int d, int e, int f,
-+ OFF_T g) = NULL;
-+ if (!real___mmap) {
-+ real___mmap = (uptr(*)(void *a, uptr b, int c, int d, int e, int f,
-+ OFF_T g))GetRealLibcAddress("__mmap");
-+ }
-+ CHECK(real___mmap);
-+ return (*real___mmap)(addr, length, prot, flags, fd, 0, offset);
-+#elif SANITIZER_NETBSDxxx
- return internal_syscall64(SYSCALL(mmap), addr, length, prot, flags, fd,
- (long)0, offset);
+ #if SANITIZER_NETBSD
+- return internal_syscall64(SYSCALL(mmap), addr, length, prot, flags, fd,
+- (long)0, offset);
++ CHECK(&__mmap);
++ return (uptr)__mmap(addr, length, prot, flags, fd, 0, offset);
#elif SANITIZER_FREEBSD || SANITIZER_LINUX_USES_64BIT_SYSCALLS
-@@ -194,20 +232,52 @@ uptr internal_mmap(void *addr, uptr leng
+ return internal_syscall(SYSCALL(mmap), (uptr)addr, length, prot, flags, fd,
+ offset);
+@@ -194,20 +233,46 @@ uptr internal_mmap(void *addr, uptr leng
#if !SANITIZER_OPENBSD
uptr internal_munmap(void *addr, uptr length) {
+#if SANITIZER_NETBSD
+ static int (*real_munmap)(void *a, uptr b) = NULL;
+ if (!real_munmap) {
-+ real_munmap = (int(*)(void *a, uptr b))GetRealLibcAddress("munmap");
++ real_munmap = (int (*)(void *a, uptr b))GetRealLibcAddress("munmap");
+ }
+ CHECK(real_munmap);
+ return (*real_munmap)(addr, length);
+#if SANITIZER_NETBSD
+ static int (*real_mprotect)(void *a, uptr b, int c) = NULL;
+ if (!real_mprotect) {
-+ real_mprotect = (int(*)(void *a, uptr b, int c))
-+ GetRealLibcAddress("mprotect");
++ real_mprotect =
++ (int (*)(void *a, uptr b, int c))GetRealLibcAddress("mprotect");
+ }
+ return (*real_mprotect)(addr, length, prot);
+#else
uptr internal_close(fd_t fd) {
+#if SANITIZER_NETBSD
-+ static int (*real_close)(int a) = NULL;
-+ if (!real_close) {
-+ real_close = (int(*)(int a))GetRealLibcAddress("close");
-+ }
-+ return (*real_close)(fd);
++ CHECK(&_sys_close);
++ return _sys_close(fd);
+#else
return internal_syscall(SYSCALL(close), fd);
+#endif
uptr internal_open(const char *filename, int flags) {
-#if SANITIZER_USES_CANONICAL_LINUX_SYSCALLS
+#if SANITIZER_NETBSD
-+ static int (*real_open)(const char *a, int b) = NULL;
-+ if (!real_open) {
-+ real_open = (int(*)(const char *a, int b))GetRealLibcAddress("open");
-+ }
-+ return (*real_open)(filename, flags);
++ CHECK(&_sys_open);
++ return _sys_open(filename, flags);
+#elif SANITIZER_USES_CANONICAL_LINUX_SYSCALLS
return internal_syscall(SYSCALL(openat), AT_FDCWD, (uptr)filename, flags);
#else
return internal_syscall_ptr(SYSCALL(open), (uptr)filename, flags);
-@@ -215,7 +285,13 @@ uptr internal_open(const char *filename,
+@@ -215,7 +280,10 @@ uptr internal_open(const char *filename,
}
uptr internal_open(const char *filename, int flags, u32 mode) {
-#if SANITIZER_USES_CANONICAL_LINUX_SYSCALLS
+#if SANITIZER_NETBSD
-+ static int (*real_open)(const char *a, int b, u32 c) = NULL;
-+ if (!real_open) {
-+ real_open = (int(*)(const char *a, int b, u32 c))GetRealLibcAddress("open");
-+ }
-+ return (*real_open)(filename, flags, mode);
++ CHECK(&_sys_open);
++ return _sys_open(filename, flags, mode);
+#elif SANITIZER_USES_CANONICAL_LINUX_SYSCALLS
return internal_syscall(SYSCALL(openat), AT_FDCWD, (uptr)filename, flags,
mode);
#else
-@@ -225,21 +301,45 @@ uptr internal_open(const char *filename,
+@@ -225,22 +293,33 @@ uptr internal_open(const char *filename,
uptr internal_read(fd_t fd, void *buf, uptr count) {
sptr res;
+#if SANITIZER_NETBSD
-+ static int (*real_read)(int a, void *b, uptr c) = NULL;
-+ if (!real_read) {
-+ real_read = (int(*)(int a, void *b, uptr c))GetRealLibcAddress("read");
-+ }
-+ CHECK(real_read);
-+ HANDLE_EINTR(res, (sptr)(*real_read)(fd, buf, count));
++ CHECK(&_sys_read);
++ HANDLE_EINTR(res, (sptr)_sys_read(fd, buf, (size_t)count));
+#else
HANDLE_EINTR(res, (sptr)internal_syscall_ptr(SYSCALL(read), fd, (uptr)buf,
count));
uptr internal_write(fd_t fd, const void *buf, uptr count) {
sptr res;
+#if SANITIZER_NETBSD
-+ static int (*real_write)(int a, const void *b, uptr c) = NULL;
-+ if (!real_write) {
-+ real_write = (int(*)(int a, const void *b, uptr c))
-+ GetRealLibcAddress("write");
-+ }
-+ HANDLE_EINTR(res, (sptr)(*real_write)(fd, buf, count));
++ CHECK(&_sys_write);
++ HANDLE_EINTR(res, (sptr)_sys_write(fd, buf, count));
+#else
HANDLE_EINTR(res, (sptr)internal_syscall_ptr(SYSCALL(write), fd, (uptr)buf,
count));
uptr internal_ftruncate(fd_t fd, uptr size) {
sptr res;
#if SANITIZER_NETBSD
-+ static int (*real_ftruncate)(int a, s64 b) = NULL;
-+ if (!real_ftruncate) {
-+ real_ftruncate = (int(*)(int a, s64 b))GetRealLibcAddress("ftruncate");
-+ }
-+ HANDLE_EINTR(res, (uptr)(*real_ftruncate)(fd, size));
-+#elif SANITIZER_NETBSDxx
- HANDLE_EINTR(res, internal_syscall64(SYSCALL(ftruncate), fd, 0, (s64)size));
+- HANDLE_EINTR(res, internal_syscall64(SYSCALL(ftruncate), fd, 0, (s64)size));
++ CHECK(&__ftruncate);
++ HANDLE_EINTR(res, __ftruncate(fd, 0, (s64)size));
#else
HANDLE_EINTR(res, (sptr)internal_syscall(SYSCALL(ftruncate), fd,
-@@ -316,7 +416,14 @@ static void kernel_stat_to_stat(struct k
+ (OFF_T)size));
+@@ -316,7 +395,14 @@ static void kernel_stat_to_stat(struct k
#endif
uptr internal_stat(const char *path, void *buf) {
+#if SANITIZER_NETBSD
+ static int (*real_stat)(const char *a, void *b) = NULL;
+ if (!real_stat) {
-+ real_stat = (int(*)(const char *a, void *b))GetRealLibcAddress("__stat50");
++ real_stat = (int (*)(const char *a, void *b))GetRealLibcAddress("__stat50");
+ }
+ CHECK(real_stat);
+ return (*real_stat)(path, buf);
-+#elif SANITIZER_FREEBSD || SANITIZER_NETBSDxx || SANITIZER_OPENBSD
++#elif SANITIZER_FREEBSD || SANITIZER_OPENBSD
return internal_syscall_ptr(SYSCALL(fstatat), AT_FDCWD, (uptr)path, (uptr)buf,
0);
#elif SANITIZER_USES_CANONICAL_LINUX_SYSCALLS
-@@ -342,6 +449,14 @@ uptr internal_stat(const char *path, voi
+@@ -342,7 +428,13 @@ uptr internal_stat(const char *path, voi
uptr internal_lstat(const char *path, void *buf) {
#if SANITIZER_NETBSD
+- return internal_syscall_ptr(SYSCALL(lstat), path, buf);
+ static int (*real_lstat)(const char *a, void *b) = NULL;
+ if (!real_lstat) {
-+ real_lstat = (int(*)(const char *a, void *b))
-+ GetRealLibcAddress("__lstat50");
++ real_lstat =
++ (int (*)(const char *a, void *b))GetRealLibcAddress("__lstat50");
+ }
+ CHECK(real_lstat);
+ return (*real_lstat)(path, buf);
-+#elif SANITIZER_NETBSDxxx
- return internal_syscall_ptr(SYSCALL(lstat), path, buf);
#elif SANITIZER_FREEBSD || SANITIZER_OPENBSD
return internal_syscall(SYSCALL(fstatat), AT_FDCWD, (uptr)path, (uptr)buf,
-@@ -368,7 +483,14 @@ uptr internal_lstat(const char *path, vo
+ AT_SYMLINK_NOFOLLOW);
+@@ -368,9 +460,16 @@ uptr internal_lstat(const char *path, vo
}
uptr internal_fstat(fd_t fd, void *buf) {
+#if SANITIZER_NETBSD
+ static int (*real_fstat)(int a, void *b) = NULL;
+ if (!real_fstat) {
-+ real_fstat = (int(*)(int a, void *b))GetRealLibcAddress("__fstat50");
++ real_fstat = (int (*)(int a, void *b))GetRealLibcAddress("__fstat50");
+ }
+ CHECK(real_fstat);
+ return (*real_fstat)(fd, buf);
-+#elif SANITIZER_FREEBSD || SANITIZER_NETBSDxx || SANITIZER_OPENBSD || \
++#elif SANITIZER_FREEBSD || SANITIZER_OPENBSD || \
SANITIZER_LINUX_USES_64BIT_SYSCALLS
- #if SANITIZER_MIPS64 && !SANITIZER_NETBSD && !SANITIZER_OPENBSD
+-#if SANITIZER_MIPS64 && !SANITIZER_NETBSD && !SANITIZER_OPENBSD
++#if SANITIZER_MIPS64 && !SANITIZER_OPENBSD
// For mips64, fstat syscall fills buffer in the format of kernel_stat
-@@ -395,7 +517,14 @@ uptr internal_filesize(fd_t fd) {
+ struct kernel_stat kbuf;
+ int res = internal_syscall(SYSCALL(fstat), fd, &kbuf);
+@@ -395,7 +494,14 @@ uptr internal_filesize(fd_t fd) {
}
uptr internal_dup2(int oldfd, int newfd) {
+#if SANITIZER_NETBSD
+ static int (*real_dup2)(int a, int b) = NULL;
+ if (!real_dup2) {
-+ real_dup2 = (int(*)(int a, int b))GetRealLibcAddress("dup2");
++ real_dup2 = (int (*)(int a, int b))GetRealLibcAddress("dup2");
+ }
+ CHECK(real_dup2);
+ return (*real_dup2)(oldfd, newfd);
return internal_syscall(SYSCALL(dup3), oldfd, newfd, 0);
#else
return internal_syscall(SYSCALL(dup2), oldfd, newfd);
-@@ -403,7 +532,15 @@ uptr internal_dup2(int oldfd, int newfd)
+@@ -403,7 +509,9 @@ uptr internal_dup2(int oldfd, int newfd)
}
uptr internal_readlink(const char *path, char *buf, uptr bufsize) {
-#if SANITIZER_USES_CANONICAL_LINUX_SYSCALLS
+#if SANITIZER_NETBSD
-+ static ssize_t (*real_readlink)(const char *a, char *b, size_t c) = NULL;
-+ if (!real_readlink) {
-+ real_readlink = (ssize_t(*)(const char *a, char *b, size_t c))
-+ GetRealLibcAddress("readlink");
-+ }
-+ CHECK(real_readlink);
-+ return (*real_readlink)(path, buf, bufsize);
++ return (uptr)_sys_readlink(path, buf, bufsize);
+#elif SANITIZER_USES_CANONICAL_LINUX_SYSCALLS
return internal_syscall(SYSCALL(readlinkat), AT_FDCWD, (uptr)path, (uptr)buf,
bufsize);
#elif SANITIZER_OPENBSD
-@@ -415,7 +552,14 @@ uptr internal_readlink(const char *path,
+@@ -415,7 +523,14 @@ uptr internal_readlink(const char *path,
}
uptr internal_unlink(const char *path) {
+#if SANITIZER_NETBSD
+ static int (*real_unlink)(const char *a) = NULL;
+ if (!real_unlink) {
-+ real_unlink = (int(*)(const char *a))GetRealLibcAddress("unlink");
++ real_unlink = (int (*)(const char *a))GetRealLibcAddress("unlink");
+ }
+ CHECK(real_unlink);
+ return (*real_unlink)(path);
return internal_syscall(SYSCALL(unlinkat), AT_FDCWD, (uptr)path, 0);
#else
return internal_syscall_ptr(SYSCALL(unlink), (uptr)path);
-@@ -423,7 +567,15 @@ uptr internal_unlink(const char *path) {
+@@ -423,7 +538,15 @@ uptr internal_unlink(const char *path) {
}
uptr internal_rename(const char *oldpath, const char *newpath) {
+#if SANITIZER_NETBSD
+ static int (*real_rename)(const char *a, const char *b) = NULL;
+ if (!real_rename) {
-+ real_rename = (int(*)(const char *a, const char *b))
-+ GetRealLibcAddress("rename");
++ real_rename =
++ (int (*)(const char *a, const char *b))GetRealLibcAddress("rename");
+ }
+ CHECK(real_rename);
+ return (*real_rename)(oldpath, newpath);
return internal_syscall(SYSCALL(renameat), AT_FDCWD, (uptr)oldpath, AT_FDCWD,
(uptr)newpath);
#else
-@@ -432,11 +584,27 @@ uptr internal_rename(const char *oldpath
+@@ -432,11 +555,23 @@ uptr internal_rename(const char *oldpath
}
uptr internal_sched_yield() {
+#if !SANITIZER_NETBSD
-+ static int (*real_sched_yield)() = NULL;
-+ if (!real_sched_yield) {
-+ real_sched_yield = (int(*)())GetRealLibcAddress("sched_yield");
-+ }
-+ CHECK(real_sched_yield);
-+ return (*real_sched_yield)();
++ CHECK(&_sys_sched_yield);
++ return _sys_sched_yield();
+#else
return internal_syscall(SYSCALL(sched_yield));
+#endif
+#if SANITIZER_NETBSD
+ static void (*real__exit)(int a) = NULL;
+ if (!real__exit) {
-+ real__exit = (void(*)(int a))GetRealLibcAddress("_exit");
++ real__exit = (void (*)(int a))GetRealLibcAddress("_exit");
+ }
+ CHECK(real__exit);
+ (*real__exit)(exitcode);
-+#elif SANITIZER_FREEBSD || SANITIZER_NETBSDxxx || SANITIZER_OPENBSD
++#elif SANITIZER_FREEBSD || SANITIZER_OPENBSD
internal_syscall(SYSCALL(exit), exitcode);
#else
internal_syscall(SYSCALL(exit_group), exitcode);
-@@ -445,18 +613,38 @@ void internal__exit(int exitcode) {
- }
-
- unsigned int internal_sleep(unsigned int seconds) {
-+#if SANITIZER_NETBSD
-+ static unsigned int (*real_sleep)(unsigned int a) = NULL;
-+ if (!real_sleep) {
-+ real_sleep = (unsigned int(*)(unsigned int a))GetRealLibcAddress("sleep");
-+ }
-+ CHECK(real_sleep);
-+ return (*real_sleep)(seconds);
-+#else
+@@ -448,15 +583,25 @@ unsigned int internal_sleep(unsigned int
struct timespec ts;
ts.tv_sec = 1;
ts.tv_nsec = 0;
++#if SANITIZER_NETBSD
++ CHECK(&_sys___nanosleep50);
++ int res = _sys___nanosleep50(&ts, &ts);
++#else
int res = internal_syscall_ptr(SYSCALL(nanosleep), &ts, &ts);
++#endif
if (res) return ts.tv_sec;
return 0;
-+#endif
}
uptr internal_execve(const char *filename, char *const argv[],
char *const envp[]) {
+#if SANITIZER_NETBSD
-+ static int (*real_execve)(const char *a, char *const b[], char *const c[])
-+ = NULL;
-+ if (!real_execve) {
-+ real_execve = (int(*)(const char *a, char *const b[], char *const c[]))
-+ GetRealLibcAddress("execve");
-+ }
-+ CHECK(real_execve);
-+ return (*real_execve)(filename, argv, envp);
++ CHECK(&_sys_execve);
++ return _sys_execve(filename, argv, envp);
+#else
return internal_syscall_ptr(SYSCALL(execve), (uptr)filename, (uptr)argv,
(uptr)envp);
}
#endif // !SANITIZER_SOLARIS
-@@ -514,12 +702,32 @@ u64 NanoTime() {
+@@ -514,12 +659,33 @@ u64 NanoTime() {
kernel_timeval tv;
#endif
internal_memset(&tv, 0, sizeof(tv));
+#if SANITIZER_NETBSD
+ static int (*real_gettimeofday)(void *a, void *b) = NULL;
+ if (!real_gettimeofday) {
-+ real_gettimeofday = (int(*)(void *a, void *b))
-+ GetRealLibcAddress("__gettimeofday50");
++ real_gettimeofday =
++ (int (*)(void *a, void *b))GetRealLibcAddress("__gettimeofday50");
+ }
+ CHECK(real_gettimeofday);
+ (*real_gettimeofday)(&tv, 0);
+#if SANITIZER_NETBSD
+ static int (*real_clock_gettime)(__sanitizer_clockid_t a, void *b) = NULL;
+ if (!real_clock_gettime) {
-+ real_clock_gettime = (int(*)(__sanitizer_clockid_t a, void *b))
-+ GetRealLibcAddress("__clock_gettime50");
++ real_clock_gettime =
++ (int (*)(__sanitizer_clockid_t a, void *b))GetRealLibcAddress(
++ "__clock_gettime50");
+ }
+ CHECK(real_clock_gettime);
+ return (*real_clock_gettime)(clk_id, tp);
}
#endif // !SANITIZER_SOLARIS
-@@ -527,7 +735,7 @@ uptr internal_clock_gettime(__sanitizer_
+@@ -527,7 +693,7 @@ uptr internal_clock_gettime(__sanitizer_
// 'environ' array (on some others) and does not use libc. This function
// should be called first inside __asan_init.
const char *GetEnv(const char *name) {
-#if SANITIZER_FREEBSD || SANITIZER_NETBSD || SANITIZER_OPENBSD || \
-+#if SANITIZER_FREEBSD || SANITIZER_NETBSD || SANITIZER_OPENBSD || \
++#if SANITIZER_FREEBSD || SANITIZER_NETBSD || SANITIZER_OPENBSD || \
SANITIZER_SOLARIS
if (::environ != 0) {
uptr NameLen = internal_strlen(name);
-@@ -767,20 +975,55 @@ uptr internal_ptrace(int request, int pi
+@@ -767,20 +933,51 @@ uptr internal_ptrace(int request, int pi
}
uptr internal_waitpid(int pid, int *status, int options) {
+#if SANITIZER_NETBSD
-+ static int (*real_waitpid)(int a, int *b, int c) = NULL;
-+ if (!real_waitpid) {
-+ real_waitpid = (int(*)(int a, int *b, int c))GetRealLibcAddress("waitpid");
-+ }
-+ CHECK(real_waitpid);
-+ return (*real_waitpid)(pid, status, options);
++ CHECK(&_sys___wait450);
++ return _sys___wait450(pid, status, options, 0 /* rusage */);
+#else
return internal_syscall_ptr(SYSCALL(wait4), pid, (uptr)status, options,
0 /* rusage */);
+#if SANITIZER_NETBSD
+ static int (*real_getpid)() = NULL;
+ if (!real_getpid) {
-+ real_getpid = (int(*)())GetRealLibcAddress("getpid");
++ real_getpid = (int (*)())GetRealLibcAddress("getpid");
+ }
+ CHECK(real_getpid);
+ return (*real_getpid)();
+#if SANITIZER_NETBSD
+ static int (*real_getppid)() = NULL;
+ if (!real_getppid) {
-+ real_getppid = (int(*)())GetRealLibcAddress("getppid");
++ real_getppid = (int (*)())GetRealLibcAddress("getppid");
+ }
+ CHECK(real_getppid);
+ return (*real_getppid)();
+#if SANITIZER_NETBSD
+ static int (*real_getdents)(int a, void *b, size_t c) = NULL;
+ if (!real_getdents) {
-+ real_getdents = (int(*)(int a, void *b, size_t c))
-+ GetRealLibcAddress("__getdents30");
++ real_getdents =
++ (int (*)(int a, void *b, size_t c))GetRealLibcAddress("__getdents30");
+ }
+ CHECK(real_getdents);
+ return (*real_getdents)(fd, dirp, count);
return internal_syscall(SYSCALL(getdirentries), fd, (uptr)dirp, count, NULL);
#elif SANITIZER_USES_CANONICAL_LINUX_SYSCALLS
return internal_syscall(SYSCALL(getdents64), fd, (uptr)dirp, count);
-@@ -791,6 +1034,14 @@ uptr internal_getdents(fd_t fd, struct l
+@@ -791,7 +988,8 @@ uptr internal_getdents(fd_t fd, struct l
uptr internal_lseek(fd_t fd, OFF_T offset, int whence) {
#if SANITIZER_NETBSD
-+ static OFF_T (*real___lseek)(int a, int b, OFF_T c, int d) = NULL;
-+ if (!real___lseek) {
-+ real___lseek = (OFF_T(*)(int a, int b, OFF_T c, int d))
-+ GetRealLibcAddress("__lseek");
-+ }
-+ CHECK(real___lseek);
-+ return (*real___lseek)(fd, 0, offset, whence);
-+#elif SANITIZER_NETBSDxxx
- return internal_syscall64(SYSCALL(lseek), fd, 0, offset, whence);
+- return internal_syscall64(SYSCALL(lseek), fd, 0, offset, whence);
++ CHECK(&__lseek);
++ return __lseek(fd, 0, offset, whence);
#else
return internal_syscall(SYSCALL(lseek), fd, offset, whence);
-@@ -804,11 +1055,28 @@ uptr internal_prctl(int option, uptr arg
+ #endif
+@@ -804,11 +1002,24 @@ uptr internal_prctl(int option, uptr arg
#endif
uptr internal_sigaltstack(const void *ss, void *oss) {
+#if SANITIZER_NETBSD
+ static int (*real_sigaltstack)(const void *a, void *b) = NULL;
+ if (!real_sigaltstack) {
-+ real_sigaltstack = (int(*)(const void *a, void *b))
-+ GetRealLibcAddress("__sigaltstack14");
++ real_sigaltstack =
++ (int (*)(const void *a, void *b))GetRealLibcAddress("__sigaltstack14");
+ }
+ CHECK(real_sigaltstack);
+ return (*real_sigaltstack)(ss, oss);
int internal_fork() {
-#if SANITIZER_USES_CANONICAL_LINUX_SYSCALLS
+#if SANITIZER_NETBSD
-+ static int (*real_fork)() = NULL;
-+ if (!real_fork) {
-+ real_fork = (int(*)())GetRealLibcAddress("fork");
-+ }
-+ CHECK(real_fork);
-+ return (*real_fork)();
++ CHECK(&__fork);
++ return __fork();
+#elif SANITIZER_USES_CANONICAL_LINUX_SYSCALLS
return internal_syscall(SYSCALL(clone), SIGCHLD, 0);
#else
return internal_syscall(SYSCALL(fork));
-@@ -891,7 +1159,15 @@ int internal_sigaction_syscall(int signu
+@@ -818,7 +1029,12 @@ int internal_fork() {
+ #if SANITIZER_FREEBSD || SANITIZER_NETBSD || SANITIZER_OPENBSD
+ int internal_sysctl(const int *name, unsigned int namelen, void *oldp,
+ uptr *oldlenp, const void *newp, uptr newlen) {
++#if SANITIZER_NETBSD
++ CHECK(&__sysctl);
++ return __sysctl(name, namelen, oldp, (size_t *)oldlenp, newp, (size_t)newlen);
++#else
+ return sysctl(name, namelen, oldp, (size_t *)oldlenp, newp, (size_t)newlen);
++#endif
+ }
+ #endif
+
+@@ -891,7 +1107,10 @@ int internal_sigaction_syscall(int signu
uptr internal_sigprocmask(int how, __sanitizer_sigset_t *set,
__sanitizer_sigset_t *oldset) {
-#if SANITIZER_FREEBSD || SANITIZER_NETBSD || SANITIZER_OPENBSD
+#if SANITIZER_NETBSD
-+ static int (*real_sigprocmask)(int a, void *b, void *c) = NULL;
-+ if (!real_sigprocmask) {
-+ real_sigprocmask = (int(*)(int a, void *b, void *c))
-+ GetRealLibcAddress("__sigprocmask14");
-+ }
-+ CHECK(real_sigprocmask);
-+ return (*real_sigprocmask)(how, set, oldset);
-+#elif SANITIZER_FREEBSD || SANITIZER_NETBSDxx || SANITIZER_OPENBSD
++ CHECK(&_sys___sigprocmask14);
++ return _sys___sigprocmask14(how, set, oldset);
++#elif SANITIZER_FREEBSD || SANITIZER_OPENBSD
return internal_syscall_ptr(SYSCALL(sigprocmask), how, set, oldset);
#else
__sanitizer_kernel_sigset_t *k_set = (__sanitizer_kernel_sigset_t *)set;
pkgsrc-wip -- http://pkgsrc.org/wip/ / pkgsrc-wip.git / commitdiff