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

Merge "Call realpath(3) only when the path is accessible for read"

Browse source
This commit is contained in:
Treehugger Robot 2019-01-25 22:41:50 +00:00 committed by Gerrit Code Review
commit 70ee1825d0
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
linker/linker_config.cpp
View file

@ -41,6 +41,7 @@
#include <limits.h>
#include <stdlib.h>
#include <unistd.h>
#include <string>
#include <unordered_map>
@ -238,9 +239,17 @@ static bool parse_config_file(const char* ld_config_file_path,
// If the path can be resolved, resolve it
char buf[PATH_MAX];
std::string resolved_path;
if (realpath(value.c_str(), buf)) {
if (access(value.c_str(), R_OK) != 0) {
if (errno == ENOENT) {
// no need to test for non-existing path. skip.
continue;
}
// If not accessible, don't call realpath as it will just cause
// SELinux denial spam. Use the path unresolved.
resolved_path = value;
} else if (realpath(value.c_str(), buf)) {
resolved_path = buf;
} else if (errno != ENOENT) {
} else {
// realpath is expected to fail with EPERM in some situations, so log
// the failure with INFO rather than DL_WARN. e.g. A binary in
// /data/local/tmp may attempt to stat /postinstall. See
@ -251,9 +260,6 @@ static bool parse_config_file(const char* ld_config_file_path,
value.c_str(),
strerror(errno));
resolved_path = value;
} else {
// ENOENT: no need to test if binary is under the path
continue;
}
if (file_is_under_dir(binary_realpath, resolved_path)) {