Skip to content
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

i#4291: append to LD_PRELOAD when using -late #4292

Merged
merged 5 commits into from
May 18, 2020
Merged

i#4291: append to LD_PRELOAD when using -late #4292

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a06b783
i#4291: append to LD_PRELOAD when using -late
mattgreen May 12, 2020
52da154
Fix macOS build errors
mattgreen May 14, 2020
51f6170
macOS: append to DYLD_INSERT_LIBRARIES if set
mattgreen May 15, 2020
1d9793a
Fix format violation
mattgreen May 15, 2020
846949c
Merge branch 'master' into i4291-append-ld-preload
derekbruening May 18, 2020
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
40 changes: 24 additions & 16 deletions core/unix/injector.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,16 +213,20 @@ report_dynamorio_problem(dcontext_t *dcontext, uint dumpcore_flag, app_pc except
static void
pre_execve_ld_preload(const char *dr_path)
{
char ld_preload_libs[MAX_OPTIONS_STRING];
char ld_lib_path[MAX_OPTIONS_STRING];
char preload_prefix[MAX_OPTIONS_STRING];
const char *last_slash = NULL;
const char *mode_slash = NULL;
const char *lib_slash = NULL;
const char *ld_preload = NULL;
const char *dr_ld_preload_libs = "libdynamorio.so libdrpreload.so";
const char *cur_preload = getenv("LD_PRELOAD");
const char *cur_path = getenv("LD_LIBRARY_PATH");
const char *cur = dr_path;
#ifdef MACOS
const char *cur_preload = getenv("DYLD_INSERT_LIBRARIES");
const char preload_delimiter = ':';
#else
const char *cur_preload = getenv("LD_PRELOAD");
const char preload_delimiter = ' ';
#endif
/* Find last three occurrences of '/'. */
while (*cur != '\0') {
if (*cur == '/') {
Expand All @@ -244,12 +248,21 @@ pre_execve_ld_preload(const char *dr_path)
last_slash - lib_slash, lib_slash, /* libNN component */
cur_path == NULL ? "" : ":", cur_path == NULL ? "" : cur_path);
NULL_TERMINATE_BUFFER(ld_lib_path);

preload_prefix[0] = '\0';
if (cur_preload != NULL) {
snprintf(preload_prefix, BUFFER_SIZE_ELEMENTS(preload_prefix), "%s%c",
cur_preload, preload_delimiter);
NULL_TERMINATE_BUFFER(preload_prefix);
}
#ifdef MACOS
setenv("DYLD_LIBRARY_PATH", ld_lib_path, true /*overwrite*/);
/* XXX: why does it not work w/o the full path? */
snprintf(ld_lib_path, BUFFER_SIZE_ELEMENTS(ld_lib_path), "%.*s/%s:%.*s/%s",
last_slash - dr_path, dr_path, "libdrpreload.dylib", last_slash - dr_path,
dr_path, "libdynamorio.dylib");
snprintf(ld_lib_path, BUFFER_SIZE_ELEMENTS(ld_lib_path), "%s%.*s/%s:%.*s/%s",
preload_prefix, last_slash - dr_path, dr_path, "libdrpreload.dylib",
last_slash - dr_path, dr_path, "libdynamorio.dylib");
NULL_TERMINATE_BUFFER(ld_lib_path);

setenv("DYLD_INSERT_LIBRARIES", ld_lib_path, true /*overwrite*/);
/* This is required to use DYLD_INSERT_LIBRARIES on apps that use
* two-level naming, but it can cause an app to run incorrectly.
Expand All @@ -259,16 +272,11 @@ pre_execve_ld_preload(const char *dr_path)
#else
setenv("LD_LIBRARY_PATH", ld_lib_path, true /*overwrite*/);

if (cur_preload != NULL) {
snprintf(ld_preload_libs, BUFFER_SIZE_ELEMENTS(ld_preload_libs), "%s %s",
cur_preload, dr_ld_preload_libs);
NULL_TERMINATE_BUFFER(ld_preload_libs);
ld_preload = ld_preload_libs;
} else {
ld_preload = dr_ld_preload_libs;
}
snprintf(ld_lib_path, BUFFER_SIZE_ELEMENTS(ld_lib_path), "%s%s", preload_prefix,
derekbruening marked this conversation as resolved.
Show resolved Hide resolved
"libdynamorio.so libdrpreload.so");
NULL_TERMINATE_BUFFER(ld_lib_path);

setenv("LD_PRELOAD", ld_preload, true /*overwrite*/);
setenv("LD_PRELOAD", ld_lib_path, true /*overwrite*/);
#endif
if (verbose) {
printf("Setting LD_USE_LOAD_BIAS for PIEs so the loader will honor "
Expand Down