Skip to content

Commit 20f5a5c

Browse files
krytarowskikrytarowski
committed
Add NetBSD support in platform_interceptors.h
Summary: Introduce SI_NETBSD for NetBSD. Add NetBSD support for appropriate `SANITIZER_INTERCEPT_*`. Part of the code inspired by the original work on libsanitizer in GCC 5.4 by Christos Zoulas. Sponsored by <The NetBSD Foundation> Reviewers: joerg, dim, kcc, alekseyshl, filcab, eugenis, vitalybuka Reviewed By: vitalybuka Subscribers: srhines, kubamracek, #sanitizers Tags: #sanitizers Differential Revision: https://reviews.llvm.org/D35468 llvm-svn: 308217
1 parent 27169a7 commit 20f5a5c

File tree

1 file changed

+57
-41
lines changed

1 file changed

+57
-41
lines changed

‎compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h‎

Lines changed: 57 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@
4949
# define SI_FREEBSD 0
5050
#endif
5151

52+
#if SANITIZER_NETBSD
53+
# define SI_NETBSD 1
54+
#else
55+
# define SI_NETBSD 0
56+
#endif
57+
5258
#if SANITIZER_LINUX
5359
# define SI_LINUX 1
5460
#else
@@ -111,7 +117,7 @@
111117
#define SANITIZER_INTERCEPT_MEMMEM \
112118
SI_NOT_WINDOWS && !SI_MAC_DEPLOYMENT_BELOW_10_7
113119
#define SANITIZER_INTERCEPT_MEMCHR 1
114-
#define SANITIZER_INTERCEPT_MEMRCHR SI_FREEBSD || SI_LINUX
120+
#define SANITIZER_INTERCEPT_MEMRCHR SI_FREEBSD || SI_LINUX || SI_NETBSD
115121

116122
#define SANITIZER_INTERCEPT_READ SI_NOT_WINDOWS
117123
#define SANITIZER_INTERCEPT_PREAD SI_NOT_WINDOWS
@@ -127,7 +133,8 @@
127133
#define SANITIZER_INTERCEPT_READV SI_NOT_WINDOWS
128134
#define SANITIZER_INTERCEPT_WRITEV SI_NOT_WINDOWS
129135

130-
#define SANITIZER_INTERCEPT_PREADV SI_FREEBSD || SI_LINUX_NOT_ANDROID
136+
#define SANITIZER_INTERCEPT_PREADV \
137+
SI_FREEBSD || SI_NETBSD || SI_LINUX_NOT_ANDROID
131138
#define SANITIZER_INTERCEPT_PWRITEV SI_LINUX_NOT_ANDROID
132139
#define SANITIZER_INTERCEPT_PREADV64 SI_LINUX_NOT_ANDROID
133140
#define SANITIZER_INTERCEPT_PWRITEV64 SI_LINUX_NOT_ANDROID
@@ -142,7 +149,7 @@
142149

143150
#ifndef SANITIZER_INTERCEPT_PRINTF
144151
# define SANITIZER_INTERCEPT_PRINTF SI_NOT_WINDOWS
145-
# define SANITIZER_INTERCEPT_PRINTF_L SI_FREEBSD
152+
# define SANITIZER_INTERCEPT_PRINTF_L SI_FREEBSD || SI_NETBSD
146153
# define SANITIZER_INTERCEPT_ISOC99_PRINTF SI_LINUX_NOT_ANDROID
147154
#endif
148155

@@ -151,13 +158,14 @@
151158

152159
#define SANITIZER_INTERCEPT_GETPWNAM_AND_FRIENDS SI_NOT_WINDOWS
153160
#define SANITIZER_INTERCEPT_GETPWNAM_R_AND_FRIENDS \
154-
SI_FREEBSD || SI_MAC || SI_LINUX_NOT_ANDROID
161+
SI_FREEBSD || SI_NETBSD || SI_MAC || SI_LINUX_NOT_ANDROID
155162
#define SANITIZER_INTERCEPT_GETPWENT \
156-
SI_FREEBSD || SI_MAC || SI_LINUX_NOT_ANDROID
163+
SI_FREEBSD || SI_NETBSD || SI_MAC || SI_LINUX_NOT_ANDROID
157164
#define SANITIZER_INTERCEPT_FGETPWENT SI_LINUX_NOT_ANDROID
158-
#define SANITIZER_INTERCEPT_GETPWENT_R SI_FREEBSD || SI_LINUX_NOT_ANDROID
165+
#define SANITIZER_INTERCEPT_GETPWENT_R \
166+
SI_FREEBSD || SI_NETBSD || SI_LINUX_NOT_ANDROID
159167
#define SANITIZER_INTERCEPT_SETPWENT SI_MAC || SI_LINUX_NOT_ANDROID
160-
#define SANITIZER_INTERCEPT_CLOCK_GETTIME SI_FREEBSD || SI_LINUX
168+
#define SANITIZER_INTERCEPT_CLOCK_GETTIME SI_FREEBSD || SI_NETBSD || SI_LINUX
161169
#define SANITIZER_INTERCEPT_GETITIMER SI_NOT_WINDOWS
162170
#define SANITIZER_INTERCEPT_TIME SI_NOT_WINDOWS
163171
#define SANITIZER_INTERCEPT_GLOB SI_LINUX_NOT_ANDROID
@@ -200,60 +208,63 @@
200208
#define SANITIZER_INTERCEPT_MBSNRTOWCS SI_MAC || SI_LINUX_NOT_ANDROID
201209
#define SANITIZER_INTERCEPT_WCSTOMBS SI_NOT_WINDOWS
202210
#define SANITIZER_INTERCEPT_WCSNRTOMBS \
203-
SI_FREEBSD || SI_MAC || SI_LINUX_NOT_ANDROID
211+
SI_FREEBSD || SI_NETBSD || SI_MAC || SI_LINUX_NOT_ANDROID
204212
#define SANITIZER_INTERCEPT_WCRTOMB \
205-
SI_FREEBSD || SI_MAC || SI_LINUX_NOT_ANDROID
213+
SI_FREEBSD || SI_NETBSD || SI_MAC || SI_LINUX_NOT_ANDROID
206214
#define SANITIZER_INTERCEPT_TCGETATTR SI_LINUX_NOT_ANDROID
207215
#define SANITIZER_INTERCEPT_REALPATH SI_NOT_WINDOWS
208216
#define SANITIZER_INTERCEPT_CANONICALIZE_FILE_NAME SI_LINUX_NOT_ANDROID
209217
#define SANITIZER_INTERCEPT_CONFSTR \
210-
SI_FREEBSD || SI_MAC || SI_LINUX_NOT_ANDROID
218+
SI_FREEBSD || SI_NETBSD || SI_MAC || SI_LINUX_NOT_ANDROID
211219
#define SANITIZER_INTERCEPT_SCHED_GETAFFINITY SI_LINUX_NOT_ANDROID
212220
#define SANITIZER_INTERCEPT_SCHED_GETPARAM SI_LINUX_NOT_ANDROID
213221
#define SANITIZER_INTERCEPT_STRERROR SI_NOT_WINDOWS
214222
#define SANITIZER_INTERCEPT_STRERROR_R SI_NOT_WINDOWS
215223
#define SANITIZER_INTERCEPT_XPG_STRERROR_R SI_LINUX_NOT_ANDROID
216224
#define SANITIZER_INTERCEPT_SCANDIR \
217-
SI_FREEBSD || SI_LINUX_NOT_ANDROID
225+
SI_FREEBSD || SI_NETBSD || SI_LINUX_NOT_ANDROID
218226
#define SANITIZER_INTERCEPT_SCANDIR64 SI_LINUX_NOT_ANDROID
219227
#define SANITIZER_INTERCEPT_GETGROUPS SI_NOT_WINDOWS
220228
#define SANITIZER_INTERCEPT_POLL SI_NOT_WINDOWS
221229
#define SANITIZER_INTERCEPT_PPOLL SI_LINUX_NOT_ANDROID
222230
#define SANITIZER_INTERCEPT_WORDEXP \
223-
SI_FREEBSD || (SI_MAC && !SI_IOS) || SI_LINUX_NOT_ANDROID
231+
SI_FREEBSD || SI_NETBSD || (SI_MAC && !SI_IOS) || SI_LINUX_NOT_ANDROID
224232
#define SANITIZER_INTERCEPT_SIGWAIT SI_NOT_WINDOWS
225233
#define SANITIZER_INTERCEPT_SIGWAITINFO SI_LINUX_NOT_ANDROID
226234
#define SANITIZER_INTERCEPT_SIGTIMEDWAIT SI_LINUX_NOT_ANDROID
227235
#define SANITIZER_INTERCEPT_SIGSETOPS \
228-
SI_FREEBSD || SI_MAC || SI_LINUX_NOT_ANDROID
236+
SI_FREEBSD || SI_NETBSD || SI_MAC || SI_LINUX_NOT_ANDROID
229237
#define SANITIZER_INTERCEPT_SIGPENDING SI_NOT_WINDOWS
230238
#define SANITIZER_INTERCEPT_SIGPROCMASK SI_NOT_WINDOWS
231-
#define SANITIZER_INTERCEPT_BACKTRACE SI_FREEBSD || SI_LINUX_NOT_ANDROID
239+
#define SANITIZER_INTERCEPT_BACKTRACE \
240+
SI_FREEBSD || SI_NETBSD || SI_LINUX_NOT_ANDROID
232241
#define SANITIZER_INTERCEPT_GETMNTENT SI_LINUX
233242
#define SANITIZER_INTERCEPT_GETMNTENT_R SI_LINUX_NOT_ANDROID
234243
#define SANITIZER_INTERCEPT_STATFS SI_FREEBSD || SI_MAC || SI_LINUX_NOT_ANDROID
235244
#define SANITIZER_INTERCEPT_STATFS64 \
236245
(SI_MAC && !SI_IOS) || SI_LINUX_NOT_ANDROID
237-
#define SANITIZER_INTERCEPT_STATVFS SI_FREEBSD || SI_LINUX_NOT_ANDROID
246+
#define SANITIZER_INTERCEPT_STATVFS \
247+
SI_FREEBSD || SI_NETBSD || SI_LINUX_NOT_ANDROID
238248
#define SANITIZER_INTERCEPT_STATVFS64 SI_LINUX_NOT_ANDROID
239249
#define SANITIZER_INTERCEPT_INITGROUPS SI_NOT_WINDOWS
240250
#define SANITIZER_INTERCEPT_ETHER_NTOA_ATON SI_NOT_WINDOWS
241251
#define SANITIZER_INTERCEPT_ETHER_HOST \
242252
SI_FREEBSD || SI_MAC || SI_LINUX_NOT_ANDROID
243253
#define SANITIZER_INTERCEPT_ETHER_R SI_FREEBSD || SI_LINUX_NOT_ANDROID
244254
#define SANITIZER_INTERCEPT_SHMCTL \
245-
((SI_FREEBSD || SI_LINUX_NOT_ANDROID) && SANITIZER_WORDSIZE == 64)
255+
SI_NETBSD || \
256+
((SI_FREEBSD || SI_LINUX_NOT_ANDROID) && SANITIZER_WORDSIZE == 64)
246257
#define SANITIZER_INTERCEPT_RANDOM_R SI_LINUX_NOT_ANDROID
247258
#define SANITIZER_INTERCEPT_PTHREAD_ATTR_GET SI_NOT_WINDOWS
248259
#define SANITIZER_INTERCEPT_PTHREAD_ATTR_GETINHERITSCHED \
249-
SI_FREEBSD || SI_MAC || SI_LINUX_NOT_ANDROID
260+
SI_FREEBSD || SI_NETBSD || SI_MAC || SI_LINUX_NOT_ANDROID
250261
#define SANITIZER_INTERCEPT_PTHREAD_ATTR_GETAFFINITY_NP SI_LINUX_NOT_ANDROID
251262
#define SANITIZER_INTERCEPT_PTHREAD_MUTEXATTR_GETPSHARED SI_NOT_WINDOWS
252263
#define SANITIZER_INTERCEPT_PTHREAD_MUTEXATTR_GETTYPE SI_NOT_WINDOWS
253264
#define SANITIZER_INTERCEPT_PTHREAD_MUTEXATTR_GETPROTOCOL \
254-
SI_MAC || SI_LINUX_NOT_ANDROID
265+
SI_MAC || SI_NETBSD || SI_LINUX_NOT_ANDROID
255266
#define SANITIZER_INTERCEPT_PTHREAD_MUTEXATTR_GETPRIOCEILING \
256-
SI_MAC || SI_LINUX_NOT_ANDROID
267+
SI_MAC || SI_NETBSD || SI_LINUX_NOT_ANDROID
257268
#define SANITIZER_INTERCEPT_PTHREAD_MUTEXATTR_GETROBUST SI_LINUX_NOT_ANDROID
258269
#define SANITIZER_INTERCEPT_PTHREAD_MUTEXATTR_GETROBUST_NP SI_LINUX_NOT_ANDROID
259270
#define SANITIZER_INTERCEPT_PTHREAD_RWLOCKATTR_GETPSHARED SI_NOT_WINDOWS
@@ -272,70 +283,74 @@
272283
#define SANITIZER_INTERCEPT_LGAMMAL_R SI_LINUX_NOT_ANDROID
273284
#define SANITIZER_INTERCEPT_DRAND48_R SI_LINUX_NOT_ANDROID
274285
#define SANITIZER_INTERCEPT_RAND_R \
275-
SI_FREEBSD || SI_MAC || SI_LINUX_NOT_ANDROID
276-
#define SANITIZER_INTERCEPT_ICONV SI_FREEBSD || SI_LINUX_NOT_ANDROID
286+
SI_FREEBSD || SI_NETBSD || SI_MAC || SI_LINUX_NOT_ANDROID
287+
#define SANITIZER_INTERCEPT_ICONV \
288+
SI_FREEBSD || SI_NETBSD || SI_LINUX_NOT_ANDROID
277289
#define SANITIZER_INTERCEPT_TIMES SI_NOT_WINDOWS
278290

279291
// FIXME: getline seems to be available on OSX 10.7
280-
#define SANITIZER_INTERCEPT_GETLINE SI_FREEBSD || SI_LINUX_NOT_ANDROID
292+
#define SANITIZER_INTERCEPT_GETLINE \
293+
SI_FREEBSD || SI_NETBSD || SI_LINUX_NOT_ANDROID
281294

282-
#define SANITIZER_INTERCEPT__EXIT SI_LINUX || SI_FREEBSD || SI_MAC
295+
#define SANITIZER_INTERCEPT__EXIT SI_LINUX || SI_FREEBSD || SI_NETBSD || SI_MAC
283296

284297
#define SANITIZER_INTERCEPT_PHTREAD_MUTEX SI_NOT_WINDOWS
285298
#define SANITIZER_INTERCEPT_PTHREAD_SETNAME_NP \
286-
SI_FREEBSD || SI_LINUX_NOT_ANDROID
299+
SI_FREEBSD || SI_NETBSD || SI_LINUX_NOT_ANDROID
287300

288301
#define SANITIZER_INTERCEPT_TLS_GET_ADDR \
289-
SI_FREEBSD || SI_LINUX_NOT_ANDROID
302+
SI_FREEBSD || SI_NETBSD || SI_LINUX_NOT_ANDROID
290303

291304
#define SANITIZER_INTERCEPT_LISTXATTR SI_LINUX
292305
#define SANITIZER_INTERCEPT_GETXATTR SI_LINUX
293306
#define SANITIZER_INTERCEPT_GETRESID SI_LINUX
294307
#define SANITIZER_INTERCEPT_GETIFADDRS \
295-
SI_FREEBSD || SI_LINUX_NOT_ANDROID || SI_MAC
308+
SI_FREEBSD || SI_NETBSD || SI_LINUX_NOT_ANDROID || SI_MAC
296309
#define SANITIZER_INTERCEPT_IF_INDEXTONAME \
297-
SI_FREEBSD || SI_LINUX_NOT_ANDROID || SI_MAC
310+
SI_FREEBSD || SI_NETBSD || SI_LINUX_NOT_ANDROID || SI_MAC
298311
#define SANITIZER_INTERCEPT_CAPGET SI_LINUX_NOT_ANDROID
299312
#if SI_LINUX && defined(__arm__)
300313
#define SANITIZER_INTERCEPT_AEABI_MEM 1
301314
#else
302315
#define SANITIZER_INTERCEPT_AEABI_MEM 0
303316
#endif
304317
#define SANITIZER_INTERCEPT___BZERO SI_MAC
305-
#define SANITIZER_INTERCEPT_FTIME !SI_FREEBSD && SI_NOT_WINDOWS
318+
#define SANITIZER_INTERCEPT_FTIME !SI_FREEBSD && !SI_NETBSD && SI_NOT_WINDOWS
306319
#define SANITIZER_INTERCEPT_XDR SI_LINUX_NOT_ANDROID
307-
#define SANITIZER_INTERCEPT_TSEARCH SI_LINUX_NOT_ANDROID || SI_MAC
320+
#define SANITIZER_INTERCEPT_TSEARCH SI_LINUX_NOT_ANDROID || SI_MAC || SI_NETBSD
308321
#define SANITIZER_INTERCEPT_LIBIO_INTERNALS SI_LINUX_NOT_ANDROID
309322
#define SANITIZER_INTERCEPT_FOPEN SI_NOT_WINDOWS
310323
#define SANITIZER_INTERCEPT_FOPEN64 SI_LINUX_NOT_ANDROID
311-
#define SANITIZER_INTERCEPT_OPEN_MEMSTREAM SI_LINUX_NOT_ANDROID
324+
#define SANITIZER_INTERCEPT_OPEN_MEMSTREAM SI_LINUX_NOT_ANDROID || SI_NETBSD
312325
#define SANITIZER_INTERCEPT_OBSTACK SI_LINUX_NOT_ANDROID
313326
#define SANITIZER_INTERCEPT_FFLUSH SI_NOT_WINDOWS
314327
#define SANITIZER_INTERCEPT_FCLOSE SI_NOT_WINDOWS
315328

316329
#ifndef SANITIZER_INTERCEPT_DLOPEN_DLCLOSE
317330
#define SANITIZER_INTERCEPT_DLOPEN_DLCLOSE \
318-
SI_FREEBSD || SI_LINUX_NOT_ANDROID || SI_MAC
331+
SI_FREEBSD || SI_NETBSD || SI_LINUX_NOT_ANDROID || SI_MAC
319332
#endif
320333

321-
#define SANITIZER_INTERCEPT_GETPASS SI_LINUX_NOT_ANDROID || SI_MAC
334+
#define SANITIZER_INTERCEPT_GETPASS SI_LINUX_NOT_ANDROID || SI_MAC || SI_NETBSD
322335
#define SANITIZER_INTERCEPT_TIMERFD SI_LINUX_NOT_ANDROID
323336

324337
#define SANITIZER_INTERCEPT_MLOCKX SI_NOT_WINDOWS
325338
#define SANITIZER_INTERCEPT_FOPENCOOKIE SI_LINUX_NOT_ANDROID
326-
#define SANITIZER_INTERCEPT_SEM SI_LINUX || SI_FREEBSD
339+
#define SANITIZER_INTERCEPT_SEM SI_LINUX || SI_FREEBSD || SI_NETBSD
327340
#define SANITIZER_INTERCEPT_PTHREAD_SETCANCEL SI_NOT_WINDOWS
328-
#define SANITIZER_INTERCEPT_MINCORE SI_LINUX
341+
#define SANITIZER_INTERCEPT_MINCORE SI_LINUX || SI_NETBSD
329342
#define SANITIZER_INTERCEPT_PROCESS_VM_READV SI_LINUX
330-
#define SANITIZER_INTERCEPT_CTERMID SI_LINUX || SI_MAC || SI_FREEBSD
343+
#define SANITIZER_INTERCEPT_CTERMID \
344+
SI_LINUX || SI_MAC || SI_FREEBSD || SI_NETBSD
331345
#define SANITIZER_INTERCEPT_CTERMID_R SI_MAC || SI_FREEBSD
332346

333347
#define SANITIZER_INTERCEPTOR_HOOKS SI_LINUX || SI_MAC || SI_WINDOWS
334348
#define SANITIZER_INTERCEPT_RECV_RECVFROM SI_NOT_WINDOWS
335349
#define SANITIZER_INTERCEPT_SEND_SENDTO SI_NOT_WINDOWS
336350
#define SANITIZER_INTERCEPT_EVENTFD_READ_WRITE SI_LINUX
337351

338-
#define SANITIZER_INTERCEPT_STAT (SI_FREEBSD || SI_MAC || SI_ANDROID)
352+
#define SANITIZER_INTERCEPT_STAT \
353+
(SI_FREEBSD || SI_MAC || SI_ANDROID || SI_NETBSD)
339354
#define SANITIZER_INTERCEPT___XSTAT !SANITIZER_INTERCEPT_STAT && SI_NOT_WINDOWS
340355
#define SANITIZER_INTERCEPT___XSTAT64 SI_LINUX_NOT_ANDROID
341356
#define SANITIZER_INTERCEPT___LXSTAT SANITIZER_INTERCEPT___XSTAT
@@ -345,12 +360,13 @@
345360
#define SANITIZER_INTERCEPT_UTMPX SI_LINUX_NOT_ANDROID || SI_MAC || SI_FREEBSD
346361

347362
#define SANITIZER_INTERCEPT_GETLOADAVG \
348-
SI_LINUX_NOT_ANDROID || SI_MAC || SI_FREEBSD
363+
SI_LINUX_NOT_ANDROID || SI_MAC || SI_FREEBSD || SI_NETBSD
349364

350-
#define SANITIZER_INTERCEPT_MALLOPT_AND_MALLINFO (!SI_FREEBSD && !SI_MAC)
351-
#define SANITIZER_INTERCEPT_MEMALIGN (!SI_FREEBSD && !SI_MAC)
352-
#define SANITIZER_INTERCEPT_PVALLOC (!SI_FREEBSD && !SI_MAC)
353-
#define SANITIZER_INTERCEPT_CFREE (!SI_FREEBSD && !SI_MAC)
365+
#define SANITIZER_INTERCEPT_MALLOPT_AND_MALLINFO \
366+
(!SI_FREEBSD && !SI_MAC && !SI_NETBSD)
367+
#define SANITIZER_INTERCEPT_MEMALIGN (!SI_FREEBSD && !SI_MAC && !SI_NETBSD)
368+
#define SANITIZER_INTERCEPT_PVALLOC (!SI_FREEBSD && !SI_MAC && !SI_NETBSD)
369+
#define SANITIZER_INTERCEPT_CFREE (!SI_FREEBSD && !SI_MAC && !SI_NETBSD)
354370
#define SANITIZER_INTERCEPT_ALIGNED_ALLOC (!SI_MAC)
355371
#define SANITIZER_INTERCEPT_MALLOC_USABLE_SIZE (!SI_MAC)
356372
#define SANITIZER_INTERCEPT_MCHECK_MPROBE SI_LINUX_NOT_ANDROID

0 commit comments

Comments
 (0)