This is an archive of the discontinued LLVM Phabricator instance.

Differential D42053

Add new NetBSD interceptors: devname(3), devname_r(3)
ClosedPublic

Authored by krytarowski on Jan 15 2018, 1:15 AM.

Details

Reviewers
joerg
vitalybuka
Commits
rGe6bba9bc6f8b: Add new NetBSD interceptors: devname(3), devname_r(3)
rCRT324120: Add new NetBSD interceptors: devname(3), devname_r(3)
rL324120: Add new NetBSD interceptors: devname(3), devname_r(3)
Summary

devname, devname_r - get device name

Sponsored by <The NetBSD Foundation>

Diff Detail

Repository
rL LLVM

Event Timeline

krytarowski created this revision.Jan 15 2018, 1:15 AM
Herald added a subscriber: kubamracek. · View Herald TranscriptJan 15 2018, 1:15 AM
krytarowski updated this revision to Diff 129811.Jan 15 2018, 1:18 AM
krytarowski edited the summary of this revision. (Show Details)Jan 16 2018, 5:19 PM
krytarowski updated this revision to Diff 132597.Feb 2 2018, 8:04 AM
  • rebase to HEAD
  • add tests
vitalybuka accepted this revision.Feb 2 2018, 10:35 AM
vitalybuka added inline comments.
test/sanitizer_common/TestCases/NetBSD/devname_r.cc
1 ↗(On Diff #132597)

here and above
// RUN: %clangxx -O0 -g %s -o %t && %run %t 2>&1 | FileCheck

This revision is now accepted and ready to land.Feb 2 2018, 10:35 AM
krytarowski updated this revision to Diff 132632.Feb 2 2018, 10:44 AM

correct tests

krytarowski marked an inline comment as done.Feb 2 2018, 10:45 AM
vitalybuka added inline comments.Feb 2 2018, 10:46 AM
test/sanitizer_common/TestCases/NetBSD/devname_r.cc
1 ↗(On Diff #132597)

FileCheck %s, I guess

Closed by commit rL324120: Add new NetBSD interceptors: devname(3), devname_r(3) (authored by kamil). · Explain WhyFeb 2 2018, 10:47 AM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: delcypher. · View Herald TranscriptFeb 2 2018, 10:47 AM
krytarowski added inline comments.Feb 2 2018, 10:48 AM
test/sanitizer_common/TestCases/NetBSD/devname_r.cc
1 ↗(On Diff #132597)

I will fix it!

krytarowski added inline comments.Feb 2 2018, 10:51 AM
test/sanitizer_common/TestCases/NetBSD/devname_r.cc
1 ↗(On Diff #132597)

SVN r. 324121

Revision Contents

PathSize
lib/
sanitizer_common/
32 lines
3 lines

Diff 129811

lib/sanitizer_common/sanitizer_common_interceptors.inc

Show First 20 Lines • Show All 6,457 Lines • ▼ Show 20 Lines
} }
#define INIT_WCSCAT \ #define INIT_WCSCAT \
COMMON_INTERCEPT_FUNCTION(wcscat); \ COMMON_INTERCEPT_FUNCTION(wcscat); \
COMMON_INTERCEPT_FUNCTION(wcsncat); COMMON_INTERCEPT_FUNCTION(wcsncat);
#else #else
#define INIT_WCSCAT #define INIT_WCSCAT
#endif #endif
#if SANITIZER_INTERCEPT_DEVNAME
INTERCEPTOR(char *, devname, u64 dev, u32 type) {
void *ctx;
char *name;
COMMON_INTERCEPTOR_ENTER(ctx, devname, dev, type);
name = REAL(devname)(dev, type);
if (name)
COMMON_INTERCEPTOR_WRITE_RANGE(ctx, name, REAL(strlen)(name) + 1);
return name;
}
#define INIT_DEVNAME COMMON_INTERCEPT_FUNCTION(devname);
#else
#define INIT_DEVNAME
#endif
#if SANITIZER_INTERCEPT_DEVNAME_R
INTERCEPTOR(int, devname_r, u64 dev, u32 type, char *path, uptr len) {
void *ctx;
int res;
COMMON_INTERCEPTOR_ENTER(ctx, devname_r, dev, type, path, len);
res = REAL(devname_r)(dev, type, path, len);
if (!res)
COMMON_INTERCEPTOR_WRITE_RANGE(ctx, path, REAL(strlen)(path) + 1);
return res;
}
#define INIT_DEVNAME_R COMMON_INTERCEPT_FUNCTION(devname_r);
#else
#define INIT_DEVNAME_R
#endif
static void InitializeCommonInterceptors() { static void InitializeCommonInterceptors() {
static u64 metadata_mem[sizeof(MetadataHashMap) / sizeof(u64) + 1]; static u64 metadata_mem[sizeof(MetadataHashMap) / sizeof(u64) + 1];
interceptor_metadata_map = new((void *)&metadata_mem) MetadataHashMap(); interceptor_metadata_map = new((void *)&metadata_mem) MetadataHashMap();
INIT_TEXTDOMAIN; INIT_TEXTDOMAIN;
INIT_STRLEN; INIT_STRLEN;
INIT_STRNLEN; INIT_STRNLEN;
INIT_STRNDUP; INIT_STRNDUP;
▲ Show 20 Lines • Show All 195 Lines • ▼ Show 20 Linesstatic void InitializeCommonInterceptors() {
INIT___LXSTAT; INIT___LXSTAT;
INIT___LXSTAT64; INIT___LXSTAT64;
// FIXME: add other *stat interceptors. // FIXME: add other *stat interceptors.
INIT_UTMP; INIT_UTMP;
INIT_UTMPX; INIT_UTMPX;
INIT_GETLOADAVG; INIT_GETLOADAVG;
INIT_WCSLEN; INIT_WCSLEN;
INIT_WCSCAT; INIT_WCSCAT;
INIT_DEVNAME;
INIT_DEVNAME_R;
#if SANITIZER_NETBSD #if SANITIZER_NETBSD
COMMON_INTERCEPT_FUNCTION(__libc_mutex_lock); COMMON_INTERCEPT_FUNCTION(__libc_mutex_lock);
COMMON_INTERCEPT_FUNCTION(__libc_mutex_unlock); COMMON_INTERCEPT_FUNCTION(__libc_mutex_unlock);
COMMON_INTERCEPT_FUNCTION(__libc_thr_setcancelstate); COMMON_INTERCEPT_FUNCTION(__libc_thr_setcancelstate);
#endif #endif
INIT___PRINTF_CHK; INIT___PRINTF_CHK;
} }

lib/sanitizer_common/sanitizer_platform_interceptors.h

Show First 20 Lines • Show All 426 Lines • ▼ Show 20 Lines#define SANITIZER_INTERCEPT_CFREE \
(!SI_FREEBSD && !SI_MAC && !SI_NETBSD && SI_NOT_FUCHSIA) (!SI_FREEBSD && !SI_MAC && !SI_NETBSD && SI_NOT_FUCHSIA)
#define SANITIZER_INTERCEPT_ALIGNED_ALLOC (!SI_MAC) #define SANITIZER_INTERCEPT_ALIGNED_ALLOC (!SI_MAC)
#define SANITIZER_INTERCEPT_MALLOC_USABLE_SIZE (!SI_MAC) #define SANITIZER_INTERCEPT_MALLOC_USABLE_SIZE (!SI_MAC)
#define SANITIZER_INTERCEPT_MCHECK_MPROBE SI_LINUX_NOT_ANDROID #define SANITIZER_INTERCEPT_MCHECK_MPROBE SI_LINUX_NOT_ANDROID
#define SANITIZER_INTERCEPT_WCSCAT SI_POSIX #define SANITIZER_INTERCEPT_WCSCAT SI_POSIX
#define SANITIZER_INTERCEPT_SIGNAL_AND_SIGACTION (!SI_WINDOWS && SI_NOT_FUCHSIA) #define SANITIZER_INTERCEPT_SIGNAL_AND_SIGACTION (!SI_WINDOWS && SI_NOT_FUCHSIA)
#define SANITIZER_INTERCEPT_BSD_SIGNAL SI_ANDROID #define SANITIZER_INTERCEPT_BSD_SIGNAL SI_ANDROID
#define SANITIZER_INTERCEPT_DEVNAME SI_NETBSD
#define SANITIZER_INTERCEPT_DEVNAME_R SI_NETBSD
#endif // #ifndef SANITIZER_PLATFORM_INTERCEPTORS_H #endif // #ifndef SANITIZER_PLATFORM_INTERCEPTORS_H