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

[DFSan] Add custom wrapper for pthread_join. 

The wrapper clears shadow for retval.

Reviewed By: stephan.yichao.zhao

Differential Revision: https://reviews.llvm.org/D93047
This commit is contained in:
Matt Morehouse 2020-12-10 13:41:17 -08:00
parent e2006ed0f7
commit 009931644a
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compiler-rt/lib/dfsan/dfsan_custom.cpp
View File

@ -427,6 +427,18 @@ SANITIZER_INTERFACE_ATTRIBUTE int __dfsw_pthread_create(
return rv;
}
SANITIZER_INTERFACE_ATTRIBUTE int __dfsw_pthread_join(pthread_t thread,
void **retval,
dfsan_label thread_label,
dfsan_label retval_label,
dfsan_label *ret_label) {
int ret = pthread_join(thread, retval);
if (ret == 0 && retval)
dfsan_set_label(0, retval, sizeof(*retval));
*ret_label = 0;
return ret;
}
struct dl_iterate_phdr_info {
int (*callback_trampoline)(void *callback, struct dl_phdr_info *info,
size_t size, void *data, dfsan_label info_label,

4
compiler-rt/lib/dfsan/done_abilist.txt
View File

@ -319,6 +319,10 @@ fun:pthread_setspecific=discard
# Functions that take a callback (wrap the callback manually).
fun:pthread_create=custom
# Functions that produce output does not depend on the input (need to zero the
# shadow manually).
fun:pthread_join=custom
###############################################################################
# libffi/libgo
###############################################################################

6
compiler-rt/test/dfsan/custom.cpp
View File

@ -792,8 +792,12 @@ void test_pthread_create() {
pthread_t pt;
pthread_create(&pt, 0, pthread_create_test_cb, (void *)1);
void *cbrv;
pthread_join(pt, &cbrv);
dfsan_set_label(i_label, &cbrv, sizeof(cbrv));
int ret = pthread_join(pt, &cbrv);
assert(ret == 0);
assert(cbrv == (void *)2);
ASSERT_ZERO_LABEL(ret);
ASSERT_ZERO_LABEL(cbrv);
}
int dl_iterate_phdr_test_cb(struct dl_phdr_info *info, size_t size,