From 178d26fa18d3132d1b7d48bd2e64aaec2ee5966e Mon Sep 17 00:00:00 2001
From: Benjamin Kramer <benny.kra@googlemail.com>
Date: Tue, 6 Nov 2018 08:53:38 +0000
Subject: [PATCH] [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
---
 .../lib/sanitizer_common/sanitizer_linux.cc   |  4 ++++
 .../test/msan/Linux/reexec_unlimited_stack.cc | 23 +++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 compiler-rt/test/msan/Linux/reexec_unlimited_stack.cc

diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
index d6ffc7081b74..1a3cbf8f8023 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);
diff --git a/compiler-rt/test/msan/Linux/reexec_unlimited_stack.cc b/compiler-rt/test/msan/Linux/reexec_unlimited_stack.cc
new file mode 100644
index 000000000000..61492ec34533
--- /dev/null
+++ b/compiler-rt/test/msan/Linux/reexec_unlimited_stack.cc
@@ -0,0 +1,23 @@
+// MSAN re-execs on unlimited stacks. We use that to verify ReExec() uses the
+// right path.
+// RUN: %clangxx_msan -O0 %s -o %t && ulimit -s unlimited && %run %t | FileCheck %s
+
+#include <stdio.h>
+
+#if !defined(__GLIBC_PREREQ)
+#define __GLIBC_PREREQ(a, b) 0
+#endif
+
+#if __GLIBC_PREREQ(2, 16)
+#include <sys/auxv.h>
+#endif
+
+int main() {
+#if __GLIBC_PREREQ(2, 16)
+  // Make sure AT_EXECFN didn't get overwritten by re-exec.
+  puts(reinterpret_cast<const char *>(getauxval(AT_EXECFN)));
+#else
+  puts("No getauxval");
+#endif
+  // CHECK-NOT: /proc/self/exe
+}