diff options
| author | Benjamin Kramer <benny.kra@googlemail.com> | 2018-11-06 08:53:38 +0000 |
|---|---|---|
| committer | Benjamin Kramer <benny.kra@googlemail.com> | 2018-11-06 08:53:38 +0000 |
| commit | 178d26fa18d3132d1b7d48bd2e64aaec2ee5966e (patch) | |
| tree | ec7a43858f7c5edcb1a3237359cdb65314b21b06 /compiler-rt/lib/sanitizer_common | |
| parent | 25f8d204b828c534dabd90700e4efa6764508094 (diff) | |
| download | bcm5719-llvm-178d26fa18d3132d1b7d48bd2e64aaec2ee5966e.tar.gz bcm5719-llvm-178d26fa18d3132d1b7d48bd2e64aaec2ee5966e.zip | |
[sanitizer] Use AT_EXECFN in ReExec() if available
execve("/proc/self/exe") will not work if the binary relies on
$EXEC_ORIGIN in an rpath. Query AT_EXECFN instead, which will give the
same string that the current binary was exec'd with.
Differential Revision: https://reviews.llvm.org/D54113
llvm-svn: 346215
Diffstat (limited to 'compiler-rt/lib/sanitizer_common')
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_linux.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc index d6ffc7081b7..1a3cbf8f802 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc @@ -640,6 +640,10 @@ void ReExec() { #elif SANITIZER_SOLARIS pathname = getexecname(); CHECK_NE(pathname, NULL); +#elif SANITIZER_USE_GETAUXVAL + // Calling execve with /proc/self/exe sets that as $EXEC_ORIGIN. Binaries that + // rely on that will fail to load shared libraries. Query AT_EXECFN instead. + pathname = reinterpret_cast<const char *>(getauxval(AT_EXECFN)); #endif GetArgsAndEnv(&argv, &envp); |
