maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[sanitizer] Intercept capget()/capset(). 

Also, fix incorrect syscall hooks for the corresponding syscalls.

llvm-svn: 201252
This commit is contained in:
Sergey Matveev 2014-02-12 19:29:49 +00:00
parent f06b266bfa
commit 2a01b2f86f
3 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
View File

@ -3265,6 +3265,36 @@ INTERCEPTOR(unsigned int, if_nametoindex, const char* ifname) {
#define INIT_IF_INDEXTONAME
#endif
#if SANITIZER_INTERCEPT_CAPGET
INTERCEPTOR(int, capget, void *hdrp, void *datap) {
void *ctx;
COMMON_INTERCEPTOR_ENTER(ctx, capget, hdrp, datap);
if (hdrp)
COMMON_INTERCEPTOR_READ_RANGE(ctx, hdrp, __user_cap_header_struct_sz);
int res = REAL(capget)(hdrp, datap);
if (res == 0 && datap)
COMMON_INTERCEPTOR_WRITE_RANGE(ctx, datap, __user_cap_data_struct_sz);
// We can also return -1 and write to hdrp->version if the version passed in
// hdrp->version is unsupported. But that's not a trivial condition to check,
// and anyway COMMON_INTERCEPTOR_READ_RANGE protects us to some extent.
return res;
}
INTERCEPTOR(int, capset, void *hdrp, const void *datap) {
void *ctx;
COMMON_INTERCEPTOR_ENTER(ctx, capset, hdrp, datap);
if (hdrp)
COMMON_INTERCEPTOR_READ_RANGE(ctx, hdrp, __user_cap_header_struct_sz);
if (datap)
COMMON_INTERCEPTOR_READ_RANGE(ctx, datap, __user_cap_data_struct_sz);
return REAL(capset)(hdrp, datap);
}
#define INIT_CAPGET \
COMMON_INTERCEPT_FUNCTION(capget); \
COMMON_INTERCEPT_FUNCTION(capset);
#else
#define INIT_CAPGET
#endif
#define SANITIZER_COMMON_INTERCEPTORS_INIT \
INIT_TEXTDOMAIN; \
INIT_STRCMP; \
@ -3386,5 +3416,6 @@ INTERCEPTOR(unsigned int, if_nametoindex, const char* ifname) {
INIT_GETXATTR; \
INIT_GETRESID; \
INIT_GETIFADDRS; \
INIT_IF_INDEXTONAME;
INIT_IF_INDEXTONAME; \
INIT_CAPGET;
/**/

15
compiler-rt/lib/sanitizer_common/sanitizer_common_syscalls.inc
View File

@ -388,24 +388,21 @@ PRE_SYSCALL(acct)(const void *name) {
POST_SYSCALL(acct)(long res, const void *name) {}
PRE_SYSCALL(capget)(void *header, void *dataptr) {}
PRE_SYSCALL(capget)(void *header, void *dataptr) {
if (header) PRE_READ(header, __user_cap_header_struct_sz);
}
POST_SYSCALL(capget)(long res, void *header, void *dataptr) {
if (res >= 0) {
if (header) POST_WRITE(header, __user_cap_header_struct_sz);
if (res >= 0)
if (dataptr) POST_WRITE(dataptr, __user_cap_data_struct_sz);
}
}
PRE_SYSCALL(capset)(void *header, const void *data) {
if (header) PRE_READ(header, __user_cap_header_struct_sz);
if (data) PRE_READ(data, __user_cap_data_struct_sz);
}
POST_SYSCALL(capset)(long res, void *header, const void *data) {
if (res >= 0) {
if (header) POST_WRITE(header, __user_cap_header_struct_sz);
}
}
POST_SYSCALL(capset)(long res, void *header, const void *data) {}
PRE_SYSCALL(personality)(long personality) {}

1
compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
View File

@ -184,5 +184,6 @@
#define SANITIZER_INTERCEPT_GETRESID SI_LINUX
#define SANITIZER_INTERCEPT_GETIFADDRS SI_LINUX_NOT_ANDROID | SI_MAC
#define SANITIZER_INTERCEPT_IF_INDEXTONAME SI_LINUX_NOT_ANDROID | SI_MAC
#define SANITIZER_INTERCEPT_CAPGET SI_LINUX_NOT_ANDROID
#endif // #ifndef SANITIZER_PLATFORM_INTERCEPTORS_H