5d3805fca3
* ubsan.c (ubsan_expand_null_ifn): Use _v1 suffixed type mismatch builtins, store max (log2 (align), 0) into uchar field instead of align into uptr field. (ubsan_expand_objsize_ifn): Use _v1 suffixed type mismatch builtins, store uchar 0 field instead of uptr 0 field. (instrument_nonnull_return): Use _v1 suffixed nonnull return builtin, instead of passing one address of struct with 2 locations pass two addresses of structs with 1 location each. * sanitizer.def (BUILT_IN_UBSAN_HANDLE_TYPE_MISMATCH, BUILT_IN_UBSAN_HANDLE_TYPE_MISMATCH_ABORT, BUILT_IN_UBSAN_HANDLE_NONNULL_RETURN, BUILT_IN_UBSAN_HANDLE_NONNULL_RETURN_ABORT): Removed. (BUILT_IN_UBSAN_HANDLE_TYPE_MISMATCH_V1, BUILT_IN_UBSAN_HANDLE_TYPE_MISMATCH_V1_ABORT, BUILT_IN_UBSAN_HANDLE_NONNULL_RETURN_V1, BUILT_IN_UBSAN_HANDLE_NONNULL_RETURN_V1_ABORT): New builtins. * c-c++-common/ubsan/float-cast-overflow-1.c: Drop value keyword from expected output regexps. * c-c++-common/ubsan/float-cast-overflow-2.c: Likewise. * c-c++-common/ubsan/float-cast-overflow-3.c: Likewise. * c-c++-common/ubsan/float-cast-overflow-4.c: Likewise. * c-c++-common/ubsan/float-cast-overflow-5.c: Likewise. * c-c++-common/ubsan/float-cast-overflow-6.c: Likewise. * c-c++-common/ubsan/float-cast-overflow-8.c: Likewise. * c-c++-common/ubsan/float-cast-overflow-9.c: Likewise. * c-c++-common/ubsan/float-cast-overflow-10.c: Likewise. * g++.dg/ubsan/float-cast-overflow-bf.C: Likewise. * gcc.dg/ubsan/float-cast-overflow-bf.c: Likewise. * g++.dg/asan/default-options-1.C (__asan_default_options): Add used attribute. * g++.dg/asan/asan_test.C: Run with ASAN_OPTIONS=handle_segv=2 in the environment. * All source files: Merge from upstream 315899. * asan/Makefile.am (nodist_saninclude_HEADERS): Add include/sanitizer/tsan_interface.h. * asan/libtool-version: Bump the libasan SONAME. * lsan/Makefile.am (sanitizer_lsan_files): Add lsan_common_mac.cc. (lsan_files): Add lsan_linux.cc, lsan_mac.cc and lsan_malloc_mac.cc. * sanitizer_common/Makefile.am (sanitizer_common_files): Add sancov_flags.cc, sanitizer_allocator_checks.cc, sanitizer_coverage_libcdep_new.cc, sanitizer_errno.cc, sanitizer_file.cc, sanitizer_mac_libcdep.cc and sanitizer_stoptheworld_mac.cc. Remove sanitizer_coverage_libcdep.cc and sanitizer_coverage_mapping_libcdep.cc. * tsan/Makefile.am (tsan_files): Add tsan_external.cc. * ubsan/Makefile.am (DEFS): Add -DUBSAN_CAN_USE_CXXABI=1. (ubsan_files): Add ubsan_init_standalone.cc and ubsan_signals_standalone.cc. * ubsan/libtool-version: Bump the libubsan SONAME. * asan/Makefile.in: Regenerate. * lsan/Makefile.in: Regenerate. * sanitizer_common/Makefile.in: Regenerate. * tsan/Makefile.in: Regenerate. * ubsan/Makefile.in: Regenerate. From-SVN: r253887
170 lines
5.3 KiB
C++
170 lines
5.3 KiB
C++
//===-- sanitizer_suppressions.cc -----------------------------------------===//
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
// Suppression parsing/matching code.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "sanitizer_suppressions.h"
|
|
|
|
#include "sanitizer_allocator_internal.h"
|
|
#include "sanitizer_common.h"
|
|
#include "sanitizer_flags.h"
|
|
#include "sanitizer_file.h"
|
|
#include "sanitizer_libc.h"
|
|
#include "sanitizer_placement_new.h"
|
|
|
|
namespace __sanitizer {
|
|
|
|
SuppressionContext::SuppressionContext(const char *suppression_types[],
|
|
int suppression_types_num)
|
|
: suppression_types_(suppression_types),
|
|
suppression_types_num_(suppression_types_num), suppressions_(1),
|
|
can_parse_(true) {
|
|
CHECK_LE(suppression_types_num_, kMaxSuppressionTypes);
|
|
internal_memset(has_suppression_type_, 0, suppression_types_num_);
|
|
}
|
|
|
|
static bool GetPathAssumingFileIsRelativeToExec(const char *file_path,
|
|
/*out*/char *new_file_path,
|
|
uptr new_file_path_size) {
|
|
InternalScopedString exec(kMaxPathLength);
|
|
if (ReadBinaryNameCached(exec.data(), exec.size())) {
|
|
const char *file_name_pos = StripModuleName(exec.data());
|
|
uptr path_to_exec_len = file_name_pos - exec.data();
|
|
internal_strncat(new_file_path, exec.data(),
|
|
Min(path_to_exec_len, new_file_path_size - 1));
|
|
internal_strncat(new_file_path, file_path,
|
|
new_file_path_size - internal_strlen(new_file_path) - 1);
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
void SuppressionContext::ParseFromFile(const char *filename) {
|
|
if (filename[0] == '\0')
|
|
return;
|
|
|
|
#if !SANITIZER_FUCHSIA
|
|
// If we cannot find the file, check if its location is relative to
|
|
// the location of the executable.
|
|
InternalScopedString new_file_path(kMaxPathLength);
|
|
if (!FileExists(filename) && !IsAbsolutePath(filename) &&
|
|
GetPathAssumingFileIsRelativeToExec(filename, new_file_path.data(),
|
|
new_file_path.size())) {
|
|
filename = new_file_path.data();
|
|
}
|
|
#endif // !SANITIZER_FUCHSIA
|
|
|
|
// Read the file.
|
|
VPrintf(1, "%s: reading suppressions file at %s\n",
|
|
SanitizerToolName, filename);
|
|
char *file_contents;
|
|
uptr buffer_size;
|
|
uptr contents_size;
|
|
if (!ReadFileToBuffer(filename, &file_contents, &buffer_size,
|
|
&contents_size)) {
|
|
Printf("%s: failed to read suppressions file '%s'\n", SanitizerToolName,
|
|
filename);
|
|
Die();
|
|
}
|
|
|
|
Parse(file_contents);
|
|
}
|
|
|
|
bool SuppressionContext::Match(const char *str, const char *type,
|
|
Suppression **s) {
|
|
can_parse_ = false;
|
|
if (!HasSuppressionType(type))
|
|
return false;
|
|
for (uptr i = 0; i < suppressions_.size(); i++) {
|
|
Suppression &cur = suppressions_[i];
|
|
if (0 == internal_strcmp(cur.type, type) && TemplateMatch(cur.templ, str)) {
|
|
*s = &cur;
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
static const char *StripPrefix(const char *str, const char *prefix) {
|
|
while (str && *str == *prefix) {
|
|
str++;
|
|
prefix++;
|
|
}
|
|
if (!*prefix)
|
|
return str;
|
|
return 0;
|
|
}
|
|
|
|
void SuppressionContext::Parse(const char *str) {
|
|
// Context must not mutate once Match has been called.
|
|
CHECK(can_parse_);
|
|
const char *line = str;
|
|
while (line) {
|
|
while (line[0] == ' ' || line[0] == '\t')
|
|
line++;
|
|
const char *end = internal_strchr(line, '\n');
|
|
if (end == 0)
|
|
end = line + internal_strlen(line);
|
|
if (line != end && line[0] != '#') {
|
|
const char *end2 = end;
|
|
while (line != end2 &&
|
|
(end2[-1] == ' ' || end2[-1] == '\t' || end2[-1] == '\r'))
|
|
end2--;
|
|
int type;
|
|
for (type = 0; type < suppression_types_num_; type++) {
|
|
const char *next_char = StripPrefix(line, suppression_types_[type]);
|
|
if (next_char && *next_char == ':') {
|
|
line = ++next_char;
|
|
break;
|
|
}
|
|
}
|
|
if (type == suppression_types_num_) {
|
|
Printf("%s: failed to parse suppressions\n", SanitizerToolName);
|
|
Die();
|
|
}
|
|
Suppression s;
|
|
s.type = suppression_types_[type];
|
|
s.templ = (char*)InternalAlloc(end2 - line + 1);
|
|
internal_memcpy(s.templ, line, end2 - line);
|
|
s.templ[end2 - line] = 0;
|
|
suppressions_.push_back(s);
|
|
has_suppression_type_[type] = true;
|
|
}
|
|
if (end[0] == 0)
|
|
break;
|
|
line = end + 1;
|
|
}
|
|
}
|
|
|
|
uptr SuppressionContext::SuppressionCount() const {
|
|
return suppressions_.size();
|
|
}
|
|
|
|
bool SuppressionContext::HasSuppressionType(const char *type) const {
|
|
for (int i = 0; i < suppression_types_num_; i++) {
|
|
if (0 == internal_strcmp(type, suppression_types_[i]))
|
|
return has_suppression_type_[i];
|
|
}
|
|
return false;
|
|
}
|
|
|
|
const Suppression *SuppressionContext::SuppressionAt(uptr i) const {
|
|
CHECK_LT(i, suppressions_.size());
|
|
return &suppressions_[i];
|
|
}
|
|
|
|
void SuppressionContext::GetMatched(
|
|
InternalMmapVector<Suppression *> *matched) {
|
|
for (uptr i = 0; i < suppressions_.size(); i++)
|
|
if (atomic_load_relaxed(&suppressions_[i].hit_count))
|
|
matched->push_back(&suppressions_[i]);
|
|
}
|
|
|
|
} // namespace __sanitizer
|