Skip to content

build-bench-env.sh: fix guarder's thread function lookup #289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
derSteFfi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

build-bench-env.sh: fix guarder's thread function lookup #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions build-bench-env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,9 @@ fi

if test "$setup_gd" = "1"; then
checkout gd $version_gd https://github.com/UTSASRG/Guarder
set +e
patch -p1 -N -r- < ../../patches/gd.patch
set -e
make -j $procs
popd
fi
Expand Down
19 changes: 19 additions & 0 deletions patches/gd.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
--- a/real.cpp
+++ b/real.cpp
@@ -43,8 +43,15 @@
INIT_WRAPPER(malloc, RTLD_NEXT);
// INIT_WRAPPER(realloc, RTLD_NEXT);

- // FIXME about the flags
+ // glibc >= 2.34 moved pthread into libc; libpthread.so.0 is an empty
+ // compatibility stub that nothing loads any more, so this dlopen returns
+ // NULL. dlsym(NULL, name) is dlsym(RTLD_DEFAULT, name), which searches the
+ // preloaded libraries first and would hand us back our own interposers
+ // below, making every thread creation recurse into itself. RTLD_NEXT
+ // starts the search after libguarder, i.e. at the real libc.
void *pthread_handle = dlopen("libpthread.so.0", RTLD_NOW | RTLD_GLOBAL | RTLD_NOLOAD);
+ if (pthread_handle == NULL)
+ pthread_handle = RTLD_NEXT;
INIT_WRAPPER(pthread_create, pthread_handle);
INIT_WRAPPER(pthread_join, pthread_handle);
INIT_WRAPPER(pthread_kill, pthread_handle);
Loading