denshooter/genode
1
0
Fork 0
mirror of https://github.com/mmueller41/genode.git synced 2026-01-21 20:42:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

sanitizer: update to version 10.3.0

Browse Source 
Issue #4094
This commit is contained in:
Christian Prochaska
2021-04-04 23:42:20 +02:00
committed by Christian Helmuth
parent 4a4b754bf2
commit d5e4ffd191
7 changed files with 150 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
repos/libports/lib/mk/libsanitizer_common.mk
View File

@@ -2,31 +2,33 @@ SANITIZER_PORT_DIR := $(call select_from_ports,sanitizer)
SANITIZER_DIR := $(SANITIZER_PORT_DIR)/src/lib/sanitizer SANITIZER_DIR := $(SANITIZER_PORT_DIR)/src/lib/sanitizer
SRC_CC = sanitizer_allocator.cc \ SRC_CC = sanitizer_allocator.cpp \
sanitizer_common.cc \ sanitizer_common.cc \
sanitizer_common_libcdep.cc \ sanitizer_common_libcdep.cpp \
sanitizer_coverage_libcdep_new.cc \ sanitizer_coverage_libcdep_new.cpp \
sanitizer_file.cc \ sanitizer_file.cpp \
sanitizer_flag_parser.cc \ sanitizer_flag_parser.cpp \
sanitizer_flags.cc \ sanitizer_flags.cpp \
sanitizer_genode.cc \ sanitizer_genode.cc \
sanitizer_libc.cc \ sanitizer_libc.cpp \
sanitizer_persistent_allocator.cc \ sanitizer_persistent_allocator.cpp \
sanitizer_printf.cc \ sanitizer_printf.cpp \
sanitizer_stackdepot.cc \ sanitizer_stackdepot.cpp \
sanitizer_stacktrace.cc \ sanitizer_stacktrace.cpp \
sanitizer_stacktrace_libcdep.cc \ sanitizer_stacktrace_libcdep.cpp \
sanitizer_stacktrace_printer.cc \ sanitizer_stacktrace_printer.cpp \
sanitizer_suppressions.cc \ sanitizer_suppressions.cpp \
sanitizer_symbolizer.cc \ sanitizer_symbolizer.cpp \
sanitizer_symbolizer_libbacktrace.cc \ sanitizer_symbolizer_libbacktrace.cpp \
sanitizer_symbolizer_libcdep.cc \ sanitizer_symbolizer_libcdep.cpp \
sanitizer_symbolizer_posix_libcdep.cc \ sanitizer_symbolizer_posix_libcdep.cpp \
sanitizer_termination.cc sanitizer_symbolizer_report.cpp \
sanitizer_termination.cpp
INC_DIR += $(SANITIZER_DIR) INC_DIR += $(SANITIZER_DIR)
vpath %.cc $(SANITIZER_DIR)/sanitizer_common vpath %.cc $(SANITIZER_DIR)/sanitizer_common
vpath %.cpp $(SANITIZER_DIR)/sanitizer_common
SHARED_LIB = yes SHARED_LIB = yes

19
repos/libports/lib/mk/libubsan.mk
View File

@@ -2,14 +2,15 @@ SANITIZER_PORT_DIR := $(call select_from_ports,sanitizer)
SANITIZER_DIR := $(SANITIZER_PORT_DIR)/src/lib/sanitizer SANITIZER_DIR := $(SANITIZER_PORT_DIR)/src/lib/sanitizer
SRC_CC = ubsan_diag.cc \ SRC_CC = ubsan_diag.cpp \
ubsan_flags.cc \ ubsan_flags.cpp \
ubsan_handlers.cc \ ubsan_handlers.cpp \
ubsan_handlers_cxx.cc \ ubsan_handlers_cxx.cpp \
ubsan_init.cc \ ubsan_init.cpp \
ubsan_type_hash.cc \ ubsan_monitor.cpp \
ubsan_type_hash_itanium.cc \ ubsan_type_hash.cpp \
ubsan_value.cc ubsan_type_hash_itanium.cpp \
ubsan_value.cpp
CC_OPT += -DCAN_SANITIZE_UB=1 -DUBSAN_CAN_USE_CXXABI=1 CC_OPT += -DCAN_SANITIZE_UB=1 -DUBSAN_CAN_USE_CXXABI=1
@@ -17,7 +18,7 @@ LIBS += libsanitizer_common
INC_DIR += $(SANITIZER_DIR) INC_DIR += $(SANITIZER_DIR)
vpath %.cc $(SANITIZER_DIR)/ubsan vpath %.cpp $(SANITIZER_DIR)/ubsan
SHARED_LIB = yes SHARED_LIB = yes

2
repos/libports/lib/symbols/libsanitizer_common
View File

@@ -203,7 +203,7 @@ _ZN11__sanitizer21ScopedErrorReportLockC2Ev T
_ZN11__sanitizer21ScopedErrorReportLockD1Ev T _ZN11__sanitizer21ScopedErrorReportLockD1Ev T
_ZN11__sanitizer21ScopedErrorReportLockD2Ev T _ZN11__sanitizer21ScopedErrorReportLockD2Ev T
_ZN11__sanitizer21SetSandboxingCallbackEPFvvE T _ZN11__sanitizer21SetSandboxingCallbackEPFvvE T
_ZN11__sanitizer21common_flags_dont_useE B 232 _ZN11__sanitizer21common_flags_dont_useE B 248
_ZN11__sanitizer22AllocatorMayReturnNullEv T _ZN11__sanitizer22AllocatorMayReturnNullEv T
_ZN11__sanitizer22CatastrophicErrorWriteEPKcm T _ZN11__sanitizer22CatastrophicErrorWriteEPKcm T
_ZN11__sanitizer22IsAllocatorOutOfMemoryEv T _ZN11__sanitizer22IsAllocatorOutOfMemoryEv T

2
repos/libports/lib/symbols/libubsan
View File

@@ -8,7 +8,7 @@ _ZN7__ubsan12ScopedReportD1Ev T
_ZN7__ubsan12ScopedReportD2Ev T _ZN7__ubsan12ScopedReportD2Ev T
_ZN7__ubsan12ignoreReportENS_14SourceLocationENS_13ReportOptionsENS_9ErrorTypeE T _ZN7__ubsan12ignoreReportENS_14SourceLocationENS_13ReportOptionsENS_9ErrorTypeE T
_ZN7__ubsan14IsPCSuppressedENS_9ErrorTypeEmPKc T _ZN7__ubsan14IsPCSuppressedENS_9ErrorTypeEmPKc T
_ZN7__ubsan14TypeCheckKindsE D 88 _ZN7__ubsan14TypeCheckKindsE D 96
_ZN7__ubsan15InitializeFlagsEv T _ZN7__ubsan15InitializeFlagsEv T
_ZN7__ubsan16InitAsStandaloneEv T _ZN7__ubsan16InitAsStandaloneEv T
_ZN7__ubsan16checkDynamicTypeEPvS0_m T _ZN7__ubsan16checkDynamicTypeEPvS0_m T

2
repos/libports/ports/sanitizer.hash
View File

@@ -1 +1 @@
3ac05b0fdf5b49cd1b375afe08095c4c1a6c5289 58ab991bee9d68f213ae71f04c796de0490f3b0e

4
repos/libports/ports/sanitizer.port
View File

@@ -1,9 +1,9 @@
LICENSE := LGPL LICENSE := LGPL
VERSION := 8.3.0 VERSION := 10.3.0
DOWNLOADS := sanitizer.archive DOWNLOADS := sanitizer.archive
URL(sanitizer) := ftp://ftp.fu-berlin.de/gnu/gcc/gcc-$(VERSION)/gcc-$(VERSION).tar.xz URL(sanitizer) := ftp://ftp.fu-berlin.de/gnu/gcc/gcc-$(VERSION)/gcc-$(VERSION).tar.xz
SHA(sanitizer) := 64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c SHA(sanitizer) := 64f404c1a650f27fc33da242e1f2df54952e3963a49e06e73f6940f3223ac344
DIR(sanitizer) := src/lib/sanitizer DIR(sanitizer) := src/lib/sanitizer
SIG(sanitizer) := ${URL(gcc)} SIG(sanitizer) := ${URL(gcc)}
KEY(sanitizer) := GNU KEY(sanitizer) := GNU

190
repos/libports/src/lib/sanitizer/sanitizer.patch
View File

@@ -4,24 +4,26 @@ From: Christian Prochaska <christian.prochaska@genode-labs.com>
--- ---
sanitizer_common/sanitizer_genode.cc | 345 ++++++++++++++++++++ sanitizer_common/sanitizer_genode.cc | 331 ++++++++++++++++++++
sanitizer_common/sanitizer_internal_defs.h | 6 sanitizer_common/sanitizer_internal_defs.h | 6
sanitizer_common/sanitizer_platform.h | 4 sanitizer_common/sanitizer_platform.h | 4
sanitizer_common/sanitizer_posix.h | 2 sanitizer_common/sanitizer_posix.h | 2
sanitizer_common/sanitizer_printf.cc | 2 sanitizer_common/sanitizer_printf.cpp | 2
sanitizer_common/sanitizer_stacktrace.h | 2 sanitizer_common/sanitizer_stacktrace.h | 2
sanitizer_common/sanitizer_symbolizer_libcdep.cc | 10 - sanitizer_common/sanitizer_symbolizer_libcdep.cpp | 10 -
.../sanitizer_symbolizer_posix_libcdep.cc | 31 +- .../sanitizer_symbolizer_posix_libcdep.cpp | 29 +-
ubsan/ubsan_diag.cc | 4 sanitizer_common/sanitizer_symbolizer_report.cpp | 4
9 files changed, 391 insertions(+), 15 deletions(-) ubsan/ubsan_diag.cpp | 4
ubsan/ubsan_flags.cpp | 6
11 files changed, 385 insertions(+), 15 deletions(-)
create mode 100644 sanitizer_common/sanitizer_genode.cc create mode 100644 sanitizer_common/sanitizer_genode.cc
diff --git a/sanitizer_common/sanitizer_genode.cc b/sanitizer_common/sanitizer_genode.cc diff --git a/sanitizer_common/sanitizer_genode.cc b/sanitizer_common/sanitizer_genode.cc
new file mode 100644 new file mode 100644
index 0000000..52dda98 index 0000000..03b1740
--- /dev/null --- /dev/null
+++ b/sanitizer_common/sanitizer_genode.cc +++ b/sanitizer_common/sanitizer_genode.cc
@@ -0,0 +1,345 @@ @@ -0,0 +1,331 @@
+/* +/*
+ * \brief Genode-specific functions from sanitizer_common.h + * \brief Genode-specific functions from sanitizer_common.h
+ * and sanitizer_libc.h + * and sanitizer_libc.h
@@ -132,12 +134,6 @@ index 0000000..52dda98
+} +}
+ +
+ +
+void __sanitizer::PrepareForSandboxing(__sanitizer_sandbox_arguments *args)
+{
+ Genode::error("sanitizer: ", __func__, " called");
+}
+
+
+const char *__sanitizer::GetEnv(const char *name) +const char *__sanitizer::GetEnv(const char *name)
+{ +{
+ if (verbose) + if (verbose)
@@ -282,14 +278,6 @@ index 0000000..52dda98
+} +}
+ +
+ +
+bool __sanitizer::RenameFile(const char *oldpath, const char *newpath,
+ error_t *error_p)
+{
+ Genode::error("sanitizer: ", __func__, " called");
+ return false;
+}
+
+
+void *__sanitizer::MapWritableFileToMemory(void *addr, uptr size, fd_t fd, +void *__sanitizer::MapWritableFileToMemory(void *addr, uptr size, fd_t fd,
+ OFF_T offset) + OFF_T offset)
+{ +{
@@ -368,10 +356,10 @@ index 0000000..52dda98
+ return false; + return false;
+} +}
diff --git a/sanitizer_common/sanitizer_internal_defs.h b/sanitizer_common/sanitizer_internal_defs.h diff --git a/sanitizer_common/sanitizer_internal_defs.h b/sanitizer_common/sanitizer_internal_defs.h
index edd6a21..a927498 100644 index 0022630..3ca8b9f 100644
--- a/sanitizer_common/sanitizer_internal_defs.h --- a/sanitizer_common/sanitizer_internal_defs.h
+++ b/sanitizer_common/sanitizer_internal_defs.h +++ b/sanitizer_common/sanitizer_internal_defs.h
@@ -13,6 +13,8 @@ @@ -14,6 +14,8 @@
#include "sanitizer_platform.h" #include "sanitizer_platform.h"
@@ -380,14 +368,14 @@ index edd6a21..a927498 100644
#ifndef SANITIZER_DEBUG #ifndef SANITIZER_DEBUG
# define SANITIZER_DEBUG 0 # define SANITIZER_DEBUG 0
#endif #endif
@@ -152,13 +154,13 @@ typedef uptr OFF_T; @@ -180,13 +182,13 @@ typedef uptr OFF_T;
typedef u64 OFF64_T; typedef u64 OFF64_T;
#if (SANITIZER_WORDSIZE == 64) || SANITIZER_MAC #if (SANITIZER_WORDSIZE == 64) || SANITIZER_MAC
-typedef uptr operator_new_size_type; -typedef uptr operator_new_size_type;
+typedef size_t operator_new_size_type; +typedef size_t operator_new_size_type;
#else #else
# if defined(__s390__) && !defined(__s390x__) # if SANITIZER_OPENBSD || defined(__s390__) && !defined(__s390x__)
// Special case: 31-bit s390 has unsigned long as size_t. // Special case: 31-bit s390 has unsigned long as size_t.
typedef unsigned long operator_new_size_type; typedef unsigned long operator_new_size_type;
# else # else
@@ -397,36 +385,38 @@ index edd6a21..a927498 100644
#endif #endif
diff --git a/sanitizer_common/sanitizer_platform.h b/sanitizer_common/sanitizer_platform.h diff --git a/sanitizer_common/sanitizer_platform.h b/sanitizer_common/sanitizer_platform.h
index 1eb4d0c..95701c2 100644 index c68bfa2..b13d28a 100644
--- a/sanitizer_common/sanitizer_platform.h --- a/sanitizer_common/sanitizer_platform.h
+++ b/sanitizer_common/sanitizer_platform.h +++ b/sanitizer_common/sanitizer_platform.h
@@ -11,10 +11,12 @@ @@ -12,12 +12,14 @@
#ifndef SANITIZER_PLATFORM_H #ifndef SANITIZER_PLATFORM_H
#define SANITIZER_PLATFORM_H #define SANITIZER_PLATFORM_H
+#if 0 +#if 0
#if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && \ #if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && \
!defined(__APPLE__) && !defined(_WIN32) && !defined(__Fuchsia__) !defined(__OpenBSD__) && !defined(__APPLE__) && !defined(_WIN32) && \
!defined(__Fuchsia__) && !defined(__rtems__) && \
!(defined(__sun__) && defined(__svr4__))
# error "This operating system is not supported" # error "This operating system is not supported"
#endif #endif
+#endif +#endif
#if defined(__linux__) #if defined(__linux__)
# define SANITIZER_LINUX 1 # define SANITIZER_LINUX 1
@@ -90,7 +92,7 @@ @@ -112,7 +114,7 @@
#endif
#define SANITIZER_POSIX \ #define SANITIZER_POSIX \
- (SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_MAC || SANITIZER_NETBSD) (SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_MAC || \
+ (SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_MAC || SANITIZER_NETBSD || 1) - SANITIZER_NETBSD || SANITIZER_OPENBSD || SANITIZER_SOLARIS)
+ SANITIZER_NETBSD || SANITIZER_OPENBSD || SANITIZER_SOLARIS || 1)
#if __LP64__ || defined(_WIN64) #if __LP64__ || defined(_WIN64)
# define SANITIZER_WORDSIZE 64 # define SANITIZER_WORDSIZE 64
diff --git a/sanitizer_common/sanitizer_posix.h b/sanitizer_common/sanitizer_posix.h diff --git a/sanitizer_common/sanitizer_posix.h b/sanitizer_common/sanitizer_posix.h
index 9626654..2afbdc0 100644 index 05fb0f6..ff76f33 100644
--- a/sanitizer_common/sanitizer_posix.h --- a/sanitizer_common/sanitizer_posix.h
+++ b/sanitizer_common/sanitizer_posix.h +++ b/sanitizer_common/sanitizer_posix.h
@@ -80,9 +80,11 @@ int my_pthread_attr_getstack(void *attr, void **addr, uptr *size); @@ -94,9 +94,11 @@ int my_pthread_attr_getstack(void *attr, void **addr, uptr *size);
// A routine named real_sigaction() must be implemented by each sanitizer in // A routine named real_sigaction() must be implemented by each sanitizer in
// order for internal_sigaction() to bypass interceptors. // order for internal_sigaction() to bypass interceptors.
int internal_sigaction(int signum, const void *act, void *oldact); int internal_sigaction(int signum, const void *act, void *oldact);
@@ -438,11 +428,11 @@ index 9626654..2afbdc0 100644
uptr internal_execve(const char *filename, char *const argv[], uptr internal_execve(const char *filename, char *const argv[],
char *const envp[]); char *const envp[]);
diff --git a/sanitizer_common/sanitizer_printf.cc b/sanitizer_common/sanitizer_printf.cc diff --git a/sanitizer_common/sanitizer_printf.cpp b/sanitizer_common/sanitizer_printf.cpp
index 1456c76..d6d46b3 100644 index a032787..fdf21c9 100644
--- a/sanitizer_common/sanitizer_printf.cc --- a/sanitizer_common/sanitizer_printf.cpp
+++ b/sanitizer_common/sanitizer_printf.cc +++ b/sanitizer_common/sanitizer_printf.cpp
@@ -16,7 +16,9 @@ @@ -17,7 +17,9 @@
#include "sanitizer_flags.h" #include "sanitizer_flags.h"
#include "sanitizer_libc.h" #include "sanitizer_libc.h"
@@ -453,11 +443,11 @@ index 1456c76..d6d46b3 100644
#if SANITIZER_WINDOWS && defined(_MSC_VER) && _MSC_VER < 1800 && \ #if SANITIZER_WINDOWS && defined(_MSC_VER) && _MSC_VER < 1800 && \
diff --git a/sanitizer_common/sanitizer_stacktrace.h b/sanitizer_common/sanitizer_stacktrace.h diff --git a/sanitizer_common/sanitizer_stacktrace.h b/sanitizer_common/sanitizer_stacktrace.h
index 31e99f6..47c7204 100644 index f1f29e9..fe310f7 100644
--- a/sanitizer_common/sanitizer_stacktrace.h --- a/sanitizer_common/sanitizer_stacktrace.h
+++ b/sanitizer_common/sanitizer_stacktrace.h +++ b/sanitizer_common/sanitizer_stacktrace.h
@@ -31,7 +31,7 @@ static const u32 kStackTraceMax = 256; @@ -36,7 +36,7 @@ static const u32 kStackTraceMax = 256;
#if SANITIZER_MAC #if SANITIZER_MAC || SANITIZER_OPENBSD || SANITIZER_RTEMS
# define SANITIZER_CAN_SLOW_UNWIND 0 # define SANITIZER_CAN_SLOW_UNWIND 0
#else #else
-# define SANITIZER_CAN_SLOW_UNWIND 1 -# define SANITIZER_CAN_SLOW_UNWIND 1
@@ -465,11 +455,11 @@ index 31e99f6..47c7204 100644
#endif #endif
struct StackTrace { struct StackTrace {
diff --git a/sanitizer_common/sanitizer_symbolizer_libcdep.cc b/sanitizer_common/sanitizer_symbolizer_libcdep.cc diff --git a/sanitizer_common/sanitizer_symbolizer_libcdep.cpp b/sanitizer_common/sanitizer_symbolizer_libcdep.cpp
index df93441..fd65874 100644 index 3b19a68..3f0f40e 100644
--- a/sanitizer_common/sanitizer_symbolizer_libcdep.cc --- a/sanitizer_common/sanitizer_symbolizer_libcdep.cpp
+++ b/sanitizer_common/sanitizer_symbolizer_libcdep.cc +++ b/sanitizer_common/sanitizer_symbolizer_libcdep.cpp
@@ -9,6 +9,8 @@ @@ -10,6 +10,8 @@
// run-time libraries. // run-time libraries.
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
@@ -478,7 +468,7 @@ index df93441..fd65874 100644
#include "sanitizer_allocator_internal.h" #include "sanitizer_allocator_internal.h"
#include "sanitizer_internal_defs.h" #include "sanitizer_internal_defs.h"
#include "sanitizer_symbolizer_internal.h" #include "sanitizer_symbolizer_internal.h"
@@ -167,7 +169,7 @@ void Symbolizer::RefreshModules() { @@ -189,7 +191,7 @@ void Symbolizer::RefreshModules() {
RAW_CHECK(modules_.size() > 0); RAW_CHECK(modules_.size() > 0);
modules_fresh_ = true; modules_fresh_ = true;
} }
@@ -487,7 +477,7 @@ index df93441..fd65874 100644
static const LoadedModule *SearchForModule(const ListOfModules &modules, static const LoadedModule *SearchForModule(const ListOfModules &modules,
uptr address) { uptr address) {
for (uptr i = 0; i < modules.size(); i++) { for (uptr i = 0; i < modules.size(); i++) {
@@ -177,8 +179,11 @@ static const LoadedModule *SearchForModule(const ListOfModules &modules, @@ -199,8 +201,11 @@ static const LoadedModule *SearchForModule(const ListOfModules &modules,
} }
return nullptr; return nullptr;
} }
@@ -500,7 +490,7 @@ index df93441..fd65874 100644
bool modules_were_reloaded = false; bool modules_were_reloaded = false;
if (!modules_fresh_) { if (!modules_fresh_) {
RefreshModules(); RefreshModules();
@@ -202,6 +207,7 @@ const LoadedModule *Symbolizer::FindModuleForAddress(uptr address) { @@ -224,6 +229,7 @@ const LoadedModule *Symbolizer::FindModuleForAddress(uptr address) {
module = SearchForModule(fallback_modules_, address); module = SearchForModule(fallback_modules_, address);
} }
return module; return module;
@@ -508,11 +498,11 @@ index df93441..fd65874 100644
} }
// For now we assume the following protocol: // For now we assume the following protocol:
diff --git a/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc b/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc diff --git a/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp b/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
index afd6bbe..9a34d2f 100644 index c123ecb..be6873c 100644
--- a/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc --- a/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
+++ b/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc +++ b/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
@@ -10,6 +10,9 @@ @@ -11,6 +11,9 @@
// POSIX-specific implementation of symbolizer parts. // POSIX-specific implementation of symbolizer parts.
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
@@ -522,7 +512,7 @@ index afd6bbe..9a34d2f 100644
#include "sanitizer_platform.h" #include "sanitizer_platform.h"
#if SANITIZER_POSIX #if SANITIZER_POSIX
#include "sanitizer_allocator_internal.h" #include "sanitizer_allocator_internal.h"
@@ -25,13 +28,14 @@ @@ -26,12 +29,14 @@
#include "sanitizer_symbolizer_libbacktrace.h" #include "sanitizer_symbolizer_libbacktrace.h"
#include "sanitizer_symbolizer_mac.h" #include "sanitizer_symbolizer_mac.h"
@@ -533,12 +523,11 @@ index afd6bbe..9a34d2f 100644
#include <stdlib.h> #include <stdlib.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <unistd.h> #include <unistd.h>
-
+#endif +#endif
#if SANITIZER_MAC
#include <util.h> // for forkpty() // C++ demangling function, as required by Itanium C++ ABI. This is weak,
#endif // SANITIZER_MAC // because we do not require a C++ ABI library to be linked to a program
@@ -61,7 +65,7 @@ const char *DemangleCXXABI(const char *name) { @@ -58,7 +63,7 @@ const char *DemangleCXXABI(const char *name) {
return name; return name;
} }
@@ -547,7 +536,7 @@ index afd6bbe..9a34d2f 100644
// As of now, there are no headers for the Swift runtime. Once they are // As of now, there are no headers for the Swift runtime. Once they are
// present, we will weakly link since we do not require Swift runtime to be // present, we will weakly link since we do not require Swift runtime to be
// linked. // linked.
@@ -92,14 +96,16 @@ const char *DemangleSwift(const char *name) { @@ -90,14 +95,16 @@ const char *DemangleSwift(const char *name) {
return nullptr; return nullptr;
} }
@@ -566,7 +555,7 @@ index afd6bbe..9a34d2f 100644
static bool CreateTwoHighNumberedPipes(int *infd_, int *outfd_) { static bool CreateTwoHighNumberedPipes(int *infd_, int *outfd_) {
int *infd = NULL; int *infd = NULL;
int *outfd = NULL; int *outfd = NULL;
@@ -139,8 +145,12 @@ static bool CreateTwoHighNumberedPipes(int *infd_, int *outfd_) { @@ -137,8 +144,12 @@ static bool CreateTwoHighNumberedPipes(int *infd_, int *outfd_) {
outfd_[1] = outfd[1]; outfd_[1] = outfd[1];
return true; return true;
} }
@@ -580,7 +569,7 @@ index afd6bbe..9a34d2f 100644
if (!FileExists(path_)) { if (!FileExists(path_)) {
if (!reported_invalid_path_) { if (!reported_invalid_path_) {
Report("WARNING: invalid path to external symbolizer!\n"); Report("WARNING: invalid path to external symbolizer!\n");
@@ -246,6 +256,7 @@ bool SymbolizerProcess::StartSymbolizerSubprocess() { @@ -196,6 +207,7 @@ bool SymbolizerProcess::StartSymbolizerSubprocess() {
} }
return true; return true;
@@ -588,16 +577,15 @@ index afd6bbe..9a34d2f 100644
} }
class Addr2LineProcess : public SymbolizerProcess { class Addr2LineProcess : public SymbolizerProcess {
@@ -443,7 +454,7 @@ const char *Symbolizer::PlatformDemangle(const char *name) { @@ -393,6 +405,7 @@ const char *Symbolizer::PlatformDemangle(const char *name) {
return DemangleSwiftAndCXX(name);
} }
void Symbolizer::PlatformPrepareForSandboxing() {}
-
+#if 0 +#if 0
static SymbolizerTool *ChooseExternalSymbolizer(LowLevelAllocator *allocator) { static SymbolizerTool *ChooseExternalSymbolizer(LowLevelAllocator *allocator) {
const char *path = common_flags()->external_symbolizer_path; const char *path = common_flags()->external_symbolizer_path;
const char *binary_name = path ? StripModuleName(path) : ""; const char *binary_name = path ? StripModuleName(path) : "";
@@ -491,7 +502,7 @@ static SymbolizerTool *ChooseExternalSymbolizer(LowLevelAllocator *allocator) { @@ -440,7 +453,7 @@ static SymbolizerTool *ChooseExternalSymbolizer(LowLevelAllocator *allocator) {
} }
return nullptr; return nullptr;
} }
@@ -606,7 +594,7 @@ index afd6bbe..9a34d2f 100644
static void ChooseSymbolizerTools(IntrusiveList<SymbolizerTool> *list, static void ChooseSymbolizerTools(IntrusiveList<SymbolizerTool> *list,
LowLevelAllocator *allocator) { LowLevelAllocator *allocator) {
if (!common_flags()->symbolize) { if (!common_flags()->symbolize) {
@@ -510,11 +521,11 @@ static void ChooseSymbolizerTools(IntrusiveList<SymbolizerTool> *list, @@ -459,11 +472,11 @@ static void ChooseSymbolizerTools(IntrusiveList<SymbolizerTool> *list,
list->push_back(tool); list->push_back(tool);
return; return;
} }
@@ -620,7 +608,7 @@ index afd6bbe..9a34d2f 100644
#if SANITIZER_MAC #if SANITIZER_MAC
VReport(2, "Using dladdr symbolizer.\n"); VReport(2, "Using dladdr symbolizer.\n");
list->push_back(new(*allocator) DlAddrSymbolizer()); list->push_back(new(*allocator) DlAddrSymbolizer());
@@ -530,7 +541,9 @@ Symbolizer *Symbolizer::PlatformInit() { @@ -479,7 +492,9 @@ Symbolizer *Symbolizer::PlatformInit() {
void Symbolizer::LateInitialize() { void Symbolizer::LateInitialize() {
Symbolizer::GetOrInit(); Symbolizer::GetOrInit();
@@ -630,11 +618,33 @@ index afd6bbe..9a34d2f 100644
} }
} // namespace __sanitizer } // namespace __sanitizer
diff --git a/ubsan/ubsan_diag.cc b/ubsan/ubsan_diag.cc diff --git a/sanitizer_common/sanitizer_symbolizer_report.cpp b/sanitizer_common/sanitizer_symbolizer_report.cpp
index 978d966..7d38a9b 100644 index c26724c..fb91e96 100644
--- a/ubsan/ubsan_diag.cc --- a/sanitizer_common/sanitizer_symbolizer_report.cpp
+++ b/ubsan/ubsan_diag.cc +++ b/sanitizer_common/sanitizer_symbolizer_report.cpp
@@ -20,7 +20,9 @@ @@ -20,7 +20,7 @@
#include "sanitizer_stacktrace_printer.h"
#include "sanitizer_symbolizer.h"
-#if SANITIZER_POSIX
+#if SANITIZER_POSIX && 0
# include "sanitizer_posix.h"
# include <sys/mman.h>
#endif
@@ -88,7 +88,7 @@ void ReportErrorSummary(const char *error_type, const StackTrace *stack,
}
void ReportMmapWriteExec(int prot) {
-#if SANITIZER_POSIX && (!SANITIZER_GO && !SANITIZER_ANDROID)
+#if SANITIZER_POSIX && (!SANITIZER_GO && !SANITIZER_ANDROID) && 0
if ((prot & (PROT_WRITE | PROT_EXEC)) != (PROT_WRITE | PROT_EXEC))
return;
diff --git a/ubsan/ubsan_diag.cpp b/ubsan/ubsan_diag.cpp
index 1b2828d..8605700 100644
--- a/ubsan/ubsan_diag.cpp
+++ b/ubsan/ubsan_diag.cpp
@@ -22,7 +22,9 @@
#include "sanitizer_common/sanitizer_stacktrace_printer.h" #include "sanitizer_common/sanitizer_stacktrace_printer.h"
#include "sanitizer_common/sanitizer_suppressions.h" #include "sanitizer_common/sanitizer_suppressions.h"
#include "sanitizer_common/sanitizer_symbolizer.h" #include "sanitizer_common/sanitizer_symbolizer.h"
@@ -644,7 +654,7 @@ index 978d966..7d38a9b 100644
using namespace __ubsan; using namespace __ubsan;
@@ -209,7 +211,9 @@ static void RenderText(InternalScopedString *Buffer, const char *Message, @@ -218,7 +220,9 @@ static void RenderText(InternalScopedString *Buffer, const char *Message,
#if SANITIZER_WINDOWS #if SANITIZER_WINDOWS
sprintf_s(FloatBuffer, sizeof(FloatBuffer), "%Lg", (long double)A.Float); sprintf_s(FloatBuffer, sizeof(FloatBuffer), "%Lg", (long double)A.Float);
#else #else
@@ -654,3 +664,29 @@ index 978d966..7d38a9b 100644
#endif #endif
Buffer->append("%s", FloatBuffer); Buffer->append("%s", FloatBuffer);
break; break;
diff --git a/ubsan/ubsan_flags.cpp b/ubsan/ubsan_flags.cpp
index 80de2a6..913fd4b 100644
--- a/ubsan/ubsan_flags.cpp
+++ b/ubsan/ubsan_flags.cpp
@@ -17,7 +17,9 @@
#include "sanitizer_common/sanitizer_flags.h"
#include "sanitizer_common/sanitizer_flag_parser.h"
+#if 0
#include <stdlib.h>
+#endif
namespace __ubsan {
@@ -30,7 +32,11 @@ static const char *GetFlag(const char *flag) {
if (SANITIZER_CAN_USE_PREINIT_ARRAY) {
return GetEnv(flag);
} else {
+#if 0
return getenv(flag);
+#else
+ return "";
+#endif
}
}