[sanitizer] Add callbacks for epoll_pwait2

Depends on D107207.

Differential Revision: https://reviews.llvm.org/D107209
This commit is contained in:
Vitaly Buka 2021-07-30 19:28:09 -07:00
parent f6f724c02e
commit ecc2c9ba45
3 changed files with 46 additions and 0 deletions

View File

@ -1225,6 +1225,16 @@
__sanitizer_syscall_post_impl_epoll_pwait( \
res, (long)(epfd), (long)(events), (long)(maxevents), (long)(timeout), \
(long)(sigmask), (long)(sigsetsize))
#define __sanitizer_syscall_pre_epoll_pwait2(epfd, events, maxevents, timeout, \
sigmask, sigsetsize) \
__sanitizer_syscall_pre_impl_epoll_pwait2( \
(long)(epfd), (long)(events), (long)(maxevents), (long)(timeout), \
(long)(sigmask), (long)(sigsetsize))
#define __sanitizer_syscall_post_epoll_pwait2(res, epfd, events, maxevents, \
timeout, sigmask, sigsetsize) \
__sanitizer_syscall_post_impl_epoll_pwait2( \
res, (long)(epfd), (long)(events), (long)(maxevents), (long)(timeout), \
(long)(sigmask), (long)(sigsetsize))
#define __sanitizer_syscall_pre_gethostname(name, len) \
__sanitizer_syscall_pre_impl_gethostname((long)(name), (long)(len))
#define __sanitizer_syscall_post_gethostname(res, name, len) \
@ -2696,6 +2706,13 @@ void __sanitizer_syscall_pre_impl_epoll_pwait(long epfd, long events,
void __sanitizer_syscall_post_impl_epoll_pwait(long res, long epfd, long events,
long maxevents, long timeout,
long sigmask, long sigsetsize);
void __sanitizer_syscall_pre_impl_epoll_pwait2(long epfd, long events,
long maxevents, long timeout,
long sigmask, long sigsetsize);
void __sanitizer_syscall_post_impl_epoll_pwait2(long res, long epfd,
long events, long maxevents,
long timeout, long sigmask,
long sigsetsize);
void __sanitizer_syscall_pre_impl_gethostname(long name, long len);
void __sanitizer_syscall_post_impl_gethostname(long res, long name, long len);
void __sanitizer_syscall_pre_impl_sethostname(long name, long len);

View File

@ -2127,6 +2127,26 @@ POST_SYSCALL(epoll_pwait)
}
}
PRE_SYSCALL(epoll_pwait2)
(long epfd, void *events, long maxevents,
const sanitizer_kernel_timespec *timeout, const kernel_sigset_t *sigmask,
long sigsetsize) {
if (timeout)
PRE_READ(timeout, sizeof(timeout));
if (sigmask)
PRE_READ(sigmask, sigsetsize);
}
POST_SYSCALL(epoll_pwait2)
(long res, long epfd, void *events, long maxevents,
const sanitizer_kernel_timespec *timeout, const void *sigmask,
long sigsetsize) {
if (res >= 0) {
if (events)
POST_WRITE(events, res * struct_epoll_event_sz);
}
}
PRE_SYSCALL(gethostname)(void *name, long len) {}
POST_SYSCALL(gethostname)(long res, void *name, long len) {

View File

@ -141,5 +141,14 @@ int main(int argc, char *argv[]) {
__sanitizer_syscall_post_epoll_pwait(max_events, 0, buf, max_events, 0, &sigset, sizeof(sigset));
assert(__msan_test_shadow(buf, sizeof(buf)) == max_events * sizeof(epoll_event));
__msan_poison(buf, sizeof(buf));
sigset = {};
timespec timespec = {};
__sanitizer_syscall_pre_epoll_pwait2(0, buf, max_events, &timespec,
&sigset, sizeof(sigset));
__sanitizer_syscall_post_epoll_pwait2(max_events, 0, buf, max_events,
&timespec, &sigset, sizeof(sigset));
assert(__msan_test_shadow(buf, sizeof(buf)) == max_events * sizeof(epoll_event));
return 0;
}