Module Name: src
Committed By: christos
Date: Tue Jun 26 20:55:38 UTC 2018
Modified Files:
src/external/gpl3/gcc/dist/libsanitizer/lsan: lsan_common.h
lsan_common_linux.cc
src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common:
sanitizer_linux.cc sanitizer_linux.h
sanitizer_stoptheworld_linux_libcdep.cc
Log Message:
Add support for lsan (Leak Sanitizer), crashes on exit, but works from gdb...
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_common.h \
src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_common_linux.cc
cvs rdiff -u -r1.18 -r1.19 \
src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.h
cvs rdiff -u -r1.1.1.3 -r1.2 \
src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_common.h
diff -u src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_common.h:1.1.1.2 src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_common.h:1.2
--- src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_common.h:1.1.1.2 Thu Feb 1 20:58:47 2018
+++ src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_common.h Tue Jun 26 16:55:37 2018
@@ -20,7 +20,7 @@
#include "sanitizer_common/sanitizer_stoptheworld.h"
#include "sanitizer_common/sanitizer_symbolizer.h"
-#if (SANITIZER_LINUX && !SANITIZER_ANDROID) && (SANITIZER_WORDSIZE == 64) \
+#if (SANITIZER_NETBSD || SANITIZER_LINUX) && !SANITIZER_ANDROID && (SANITIZER_WORDSIZE == 64) \
&& (defined(__x86_64__) || defined(__mips64) || defined(__aarch64__))
#define CAN_SANITIZE_LEAKS 1
#else
Index: src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_common_linux.cc
diff -u src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_common_linux.cc:1.1.1.2 src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_common_linux.cc:1.2
--- src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_common_linux.cc:1.1.1.2 Thu Feb 1 20:58:47 2018
+++ src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_common_linux.cc Tue Jun 26 16:55:37 2018
@@ -13,7 +13,7 @@
#include "sanitizer_common/sanitizer_platform.h"
#include "lsan_common.h"
-#if CAN_SANITIZE_LEAKS && SANITIZER_LINUX
+#if CAN_SANITIZE_LEAKS && (SANITIZER_LINUX || SANITIZER_NETBSD)
#include <link.h>
#include "sanitizer_common/sanitizer_common.h"
@@ -174,4 +174,4 @@ void DoStopTheWorld(StopTheWorldCallback
} // namespace __lsan
-#endif // CAN_SANITIZE_LEAKS && SANITIZER_LINUX
+#endif // CAN_SANITIZE_LEAKS && (SANITIZER_LINUX || SANITIZER_NETBSD)
Index: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc
diff -u src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc:1.18 src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc:1.19
--- src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc:1.18 Mon Jun 4 09:12:54 2018
+++ src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc Tue Jun 26 16:55:38 2018
@@ -633,6 +633,16 @@ int internal_fork() {
#endif
}
+#if SANITIZER_NETBSD
+#include <signal.h>
+extern "C" int __sigaction14(int, const struct sigaction *, struct sigaction *);
+int internal_sigaction_norestorer(int signum, const void *act, void *oldact) {
+
+ return __sigaction14(signum,
+ reinterpret_cast<const struct sigaction *>(act),
+ reinterpret_cast<struct sigaction *>(oldact));
+}
+#endif
#if SANITIZER_LINUX
#define SA_RESTORER 0x04000000
// Doesn't set sa_restorer, use with caution (see below).
Index: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.h
diff -u src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.h:1.4 src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.h:1.5
--- src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.h:1.4 Thu Feb 1 22:41:11 2018
+++ src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.h Tue Jun 26 16:55:38 2018
@@ -48,6 +48,15 @@ uptr internal_clone(int (*fn)(void *), v
#endif
#endif // SANITIZER_LINUX
+#ifdef SANITIZER_NETBSD
+int internal_sigaction_norestorer(int signum, const void *act, void *oldact);
+#define internal_sigdelset(set, signum) \
+ __sigdelset(set, signum)
+#define internal_clone(fn, child_stack, flags, arg, \
+ parent_tidptr, newtls, child_tidptr) \
+ __clone(fn, child_stack, flags, arg)
+#endif
+
// This class reads thread IDs from /proc/<pid>/task using only syscalls.
class ThreadLister {
public:
Index: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
diff -u src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc:1.1.1.3 src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc:1.2
--- src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc:1.1.1.3 Thu Feb 1 20:58:47 2018
+++ src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc Tue Jun 26 16:55:38 2018
@@ -12,8 +12,8 @@
#include "sanitizer_platform.h"
-#if SANITIZER_LINUX && (defined(__x86_64__) || defined(__mips__) || \
- defined(__aarch64__))
+#if (SANITIZER_NETBSD || SANITIZER_LINUX) && \
+ (defined(__x86_64__) || defined(__mips__) || defined(__aarch64__))
#include "sanitizer_stoptheworld.h"
@@ -23,7 +23,10 @@
#include <errno.h>
#include <sched.h> // for CLONE_* definitions
#include <stddef.h>
+#include <signal.h>
+#if SANITIZER_LINUX
#include <sys/prctl.h> // for PR_* definitions
+#endif
#include <sys/ptrace.h> // for PTRACE_* definitions
#include <sys/types.h> // for pid_t
#include <sys/uio.h> // for iovec
@@ -35,7 +38,19 @@
// GLIBC 2.20+ sys/user does not include asm/ptrace.h
# include <asm/ptrace.h>
# endif
-# include <sys/user.h> // for user_regs_struct
+# if !SANITIZER_NETBSD
+# include <sys/user.h> // for user_regs_struct
+# else
+# define PTRACE_ATTACH PT_ATTACH
+# define PTRACE_GETREGS PT_GETREGS
+# define PTRACE_KILL PT_KILL
+# define PTRACE_DETACH PT_DETACH
+# define PTRACE_CONT PT_CONTINUE
+# define CLONE_UNTRACED 0
+# include <machine/reg.h>
+typedef struct reg user_regs;
+typedef struct reg user_regs_struct;
+# endif
#endif
#include <sys/wait.h> // for signal-related stuff
@@ -250,7 +265,9 @@ static int TracerThread(void* argument)
TracerThreadArgument *tracer_thread_argument =
(TracerThreadArgument *)argument;
+#ifdef PR_SET_PDEADTHSIG
internal_prctl(PR_SET_PDEATHSIG, SIGKILL, 0, 0, 0);
+#endif
// Check if parent is already dead.
if (internal_getppid() != tracer_thread_argument->parent_pid)
internal__exit(4);
@@ -333,15 +350,19 @@ class StopTheWorldScope {
StopTheWorldScope() {
// Make this process dumpable. Processes that are not dumpable cannot be
// attached to.
+#ifdef PR_GET_DUMPABLE
process_was_dumpable_ = internal_prctl(PR_GET_DUMPABLE, 0, 0, 0, 0);
if (!process_was_dumpable_)
internal_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
+#endif
}
~StopTheWorldScope() {
+#ifdef PR_GET_DUMPABLE
// Restore the dumpable flag.
if (!process_was_dumpable_)
internal_prctl(PR_SET_DUMPABLE, 0, 0, 0, 0);
+#endif
}
private:
@@ -443,38 +464,39 @@ void StopTheWorld(StopTheWorldCallback c
}
// Platform-specific methods from SuspendedThreadsList.
-#if SANITIZER_ANDROID && defined(__arm__)
+#if SANITIZER_ANDROID
+# if defined(__arm__)
typedef pt_regs regs_struct;
-#define REG_SP ARM_sp
-
-#elif SANITIZER_LINUX && defined(__arm__)
+# define PTRACE_REG_SP(r) (r)->ARM_sp
+# endif
+#elif SANITIZER_LINUX
+# if defined(__arm__)
typedef user_regs regs_struct;
-#define REG_SP uregs[13]
-
-#elif defined(__i386__) || defined(__x86_64__)
+# define PTRACE_REG_SP(r) (r)->uregs[13]
+# elif defined(__i386__)
typedef user_regs_struct regs_struct;
-#if defined(__i386__)
-#define REG_SP esp
-#else
-#define REG_SP rsp
-#endif
-
-#elif defined(__powerpc__) || defined(__powerpc64__)
+# define PTRACE_REG_SP(r) (r)->esp
+# elif defined(__x86_64__)
+typedef user_regs_struct regs_struct;
+# define PTRACE_REG_SP(r) (r)->rsp
+# elif defined(__powerpc__) || defined(__powerpc64__)
typedef pt_regs regs_struct;
-#define REG_SP gpr[PT_R1]
-
-#elif defined(__mips__)
+# define PTRACE_REG_SP(r) (r)->gpr[PT_R1]
+# elif defined(__mips__)
typedef struct user regs_struct;
-#define REG_SP regs[EF_REG29]
-
-#elif defined(__aarch64__)
+# define PTRACE_REG_SP(r) (r)->regs[EF_REG29]
+# elif defined(__aarch64__)
typedef struct user_pt_regs regs_struct;
-#define REG_SP sp
-#define ARCH_IOVEC_FOR_GETREGSET
+# define PTRACE_REG_SP(r) (r)->sp
+# define ARCH_IOVEC_FOR_GETREGSET
+# endif
+#elif SANITIZER_NETBSD
+typedef reg regs_struct;
+#endif
-#else
+#ifndef PTRACE_REG_SP
#error "Unsupported architecture"
-#endif // SANITIZER_ANDROID && defined(__arm__)
+#endif
int SuspendedThreadsList::GetRegistersAndSP(uptr index,
uptr *buffer,
@@ -499,7 +521,7 @@ int SuspendedThreadsList::GetRegistersAn
return -1;
}
- *sp = regs.REG_SP;
+ *sp = PTRACE_REG_SP(®s);
internal_memcpy(buffer, ®s, sizeof(regs));
return 0;
}
