tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Make LD_PRELOAD failures just warnings."

Browse source
This commit is contained in:
Elliott Hughes 2013-06-18 20:23:07 +00:00 committed by Gerrit Code Review
commit 6807af773f
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
linker/linker.cpp
View file

@ -1492,18 +1492,19 @@ static bool soinfo_link_image(soinfo* si) {
return false;
}
/* if this is the main executable, then load all of the preloads now */
// If this is the main executable, then load all of the libraries from LD_PRELOAD now.
if (si->flags & FLAG_EXE) {
memset(gLdPreloads, 0, sizeof(gLdPreloads));
size_t preload_count = 0;
for (size_t i = 0; gLdPreloadNames[i] != NULL; i++) {
soinfo* lsi = find_library(gLdPreloadNames[i]);
if (lsi == NULL) {
strlcpy(tmp_err_buf, linker_get_error_buffer(), sizeof(tmp_err_buf));
DL_ERR("could not load library \"%s\" needed by \"%s\"; caused by %s",
gLdPreloadNames[i], si->name, tmp_err_buf);
return false;
if (lsi != NULL) {
gLdPreloads[preload_count++] = lsi;
} else {
// As with glibc, failure to load an LD_PRELOAD library is just a warning.
DL_WARN("could not load library \"%s\" from LD_PRELOAD for \"%s\"; caused by %s",
gLdPreloadNames[i], si->name, linker_get_error_buffer());
}
gLdPreloads[i] = lsi;
}
}

11
linker/linker.h
View file

@ -43,7 +43,16 @@
__libc_format_buffer(linker_get_error_buffer(), linker_get_error_buffer_size(), fmt, ##x); \
/* If LD_DEBUG is set high enough, log every dlerror(3) message. */ \
DEBUG("%s\n", linker_get_error_buffer()); \
} while(0)
} while (false)
#define DL_WARN(fmt, x...) \
do { \
__libc_format_log(ANDROID_LOG_WARN, "linker", fmt, ##x); \
__libc_format_fd(2, "WARNING: linker: "); \
__libc_format_fd(2, fmt, ##x); \
__libc_format_fd(2, "\n"); \
} while (false)
// Returns the address of the page containing address 'x'.
#define PAGE_START(x) ((x) & PAGE_MASK)