diff options
Diffstat (limited to 'compiler-rt/lib/msan/msan.cc')
| -rw-r--r-- | compiler-rt/lib/msan/msan.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/compiler-rt/lib/msan/msan.cc b/compiler-rt/lib/msan/msan.cc index cecbfe06a02..c65e999a1d4 100644 --- a/compiler-rt/lib/msan/msan.cc +++ b/compiler-rt/lib/msan/msan.cc @@ -22,6 +22,10 @@ #include "sanitizer_common/sanitizer_flags.h" #include "sanitizer_common/sanitizer_flag_parser.h" #include "sanitizer_common/sanitizer_libc.h" +#if defined(__s390x__) && defined(__linux__) +// For AvoidCVE_2016_2143. +#include "sanitizer_common/sanitizer_linux.h" +#endif #include "sanitizer_common/sanitizer_procmaps.h" #include "sanitizer_common/sanitizer_stacktrace.h" #include "sanitizer_common/sanitizer_symbolizer.h" @@ -375,6 +379,9 @@ void __msan_init() { msan_init_is_running = 1; SanitizerToolName = "MemorySanitizer"; +#if defined(__s390x__) && defined(__linux__) + AvoidCVE_2016_2143(); +#endif InitTlsSize(); CacheBinaryName(); |
