maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[asan] Reify ErrorAllocTypeMismatch 

Summary: Continuing implementation mentioned in this thread: http://lists.llvm.org/pipermail/llvm-dev/2016-July/101933.html

Reviewers: kcc, eugenis, vitalybuka

Subscribers: llvm-commits, kubabrecka

Differential Revision: https://reviews.llvm.org/D24390

llvm-svn: 281390
This commit is contained in:
Filipe Cabecinhas 2016-09-13 20:47:33 +00:00
parent 6fb5462c46
commit 92c5b5de5c
3 changed files with 49 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
compiler-rt/lib/asan/asan_errors.cc
View File

@ -141,4 +141,27 @@ void ErrorFreeNotMalloced::Print() {
ReportErrorSummary("bad-free", &stack); ReportErrorSummary("bad-free", &stack);
} }
void ErrorAllocTypeMismatch::Print() {
static const char *alloc_names[] = {"INVALID", "malloc", "operator new",
"operator new []"};
static const char *dealloc_names[] = {"INVALID", "free", "operator delete",
"operator delete []"};
CHECK_NE(alloc_type, dealloc_type);
Decorator d;
Printf("%s", d.Warning());
Report("ERROR: AddressSanitizer: alloc-dealloc-mismatch (%s vs %s) on %p\n",
alloc_names[alloc_type], dealloc_names[dealloc_type],
addr_description.addr);
Printf("%s", d.EndWarning());
CHECK_GT(dealloc_stack->size, 0);
scariness.Print();
GET_STACK_TRACE_FATAL(dealloc_stack->trace[0], dealloc_stack->top_frame_bp);
stack.Print();
addr_description.Print();
ReportErrorSummary("alloc-dealloc-mismatch", &stack);
Report(
"HINT: if you don't care about these errors you may set "
"ASAN_OPTIONS=alloc_dealloc_mismatch=0\n");
}
} // namespace __asan } // namespace __asan

24
compiler-rt/lib/asan/asan_errors.h
View File

@ -139,13 +139,35 @@ struct ErrorFreeNotMalloced : ErrorBase {
void Print(); void Print();
}; };
struct ErrorAllocTypeMismatch : ErrorBase {
// ErrorAllocTypeMismatch doesn't own the stack trace.
const BufferedStackTrace *dealloc_stack;
HeapAddressDescription addr_description;
AllocType alloc_type, dealloc_type;
// VS2013 doesn't implement unrestricted unions, so we need a trivial default
// constructor
ErrorAllocTypeMismatch() = default;
ErrorAllocTypeMismatch(u32 tid, BufferedStackTrace *stack, uptr addr,
AllocType alloc_type_, AllocType dealloc_type_)
: ErrorBase(tid),
dealloc_stack(stack),
alloc_type(alloc_type_),
dealloc_type(dealloc_type_) {
GetHeapAddressInformation(addr, 1, &addr_description);
scariness.Clear();
scariness.Scare(10, "alloc-dealloc-mismatch");
};
void Print();
};
// clang-format off // clang-format off
#define ASAN_FOR_EACH_ERROR_KIND(macro) \ #define ASAN_FOR_EACH_ERROR_KIND(macro) \
macro(StackOverflow) \ macro(StackOverflow) \
macro(DeadlySignal) \ macro(DeadlySignal) \
macro(DoubleFree) \ macro(DoubleFree) \
macro(NewDeleteSizeMismatch) \ macro(NewDeleteSizeMismatch) \
macro(FreeNotMalloced) macro(FreeNotMalloced) \
macro(AllocTypeMismatch)
// clang-format on // clang-format on
#define ASAN_DEFINE_ERROR_KIND(name) kErrorKind##name, #define ASAN_DEFINE_ERROR_KIND(name) kErrorKind##name,

21
compiler-rt/lib/asan/asan_report.cc
View File

@ -357,25 +357,10 @@ void ReportFreeNotMalloced(uptr addr, BufferedStackTrace *free_stack) {
void ReportAllocTypeMismatch(uptr addr, BufferedStackTrace *free_stack, void ReportAllocTypeMismatch(uptr addr, BufferedStackTrace *free_stack,
AllocType alloc_type, AllocType alloc_type,
AllocType dealloc_type) { AllocType dealloc_type) {
static const char *alloc_names[] =
{"INVALID", "malloc", "operator new", "operator new []"};
static const char *dealloc_names[] =
{"INVALID", "free", "operator delete", "operator delete []"};
CHECK_NE(alloc_type, dealloc_type);
ScopedInErrorReport in_report; ScopedInErrorReport in_report;
Decorator d; ErrorAllocTypeMismatch error(GetCurrentTidOrInvalid(), free_stack, addr,
Printf("%s", d.Warning()); alloc_type, dealloc_type);
Report("ERROR: AddressSanitizer: alloc-dealloc-mismatch (%s vs %s) on %p\n", in_report.ReportError(error);
alloc_names[alloc_type], dealloc_names[dealloc_type], addr);
Printf("%s", d.EndWarning());
CHECK_GT(free_stack->size, 0);
ScarinessScore::PrintSimple(10, "alloc-dealloc-mismatch");
GET_STACK_TRACE_FATAL(free_stack->trace[0], free_stack->top_frame_bp);
stack.Print();
DescribeAddressIfHeap(addr);
ReportErrorSummary("alloc-dealloc-mismatch", &stack);
Report("HINT: if you don't care about these errors you may set "
"ASAN_OPTIONS=alloc_dealloc_mismatch=0\n");
} }
void ReportMallocUsableSizeNotOwned(uptr addr, BufferedStackTrace *stack) { void ReportMallocUsableSizeNotOwned(uptr addr, BufferedStackTrace *stack) {