diff options
author | Kostya Serebryany <kcc@google.com> | 2016-05-06 23:38:07 +0000 |
---|---|---|
committer | Kostya Serebryany <kcc@google.com> | 2016-05-06 23:38:07 +0000 |
commit | 8b8f7a3cda6f33b19fb7880c35652e0be9d26104 (patch) | |
tree | 576c736549c4602f010fb50e518535be04f910dc /llvm/lib/Fuzzer/FuzzerLoop.cpp | |
parent | b2e2e21b20ae00a47e931bdb66d2980453e2d717 (diff) | |
download | llvm-8b8f7a3cda6f33b19fb7880c35652e0be9d26104.zip llvm-8b8f7a3cda6f33b19fb7880c35652e0be9d26104.tar.gz llvm-8b8f7a3cda6f33b19fb7880c35652e0be9d26104.tar.bz2 |
[libFuzzer] enhance -rss_limit_mb and enable by default. Now it will print the OOM reproducer.
llvm-svn: 268821
Diffstat (limited to 'llvm/lib/Fuzzer/FuzzerLoop.cpp')
-rw-r--r-- | llvm/lib/Fuzzer/FuzzerLoop.cpp | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/llvm/lib/Fuzzer/FuzzerLoop.cpp b/llvm/lib/Fuzzer/FuzzerLoop.cpp index e02ebcf..6a7fe7d 100644 --- a/llvm/lib/Fuzzer/FuzzerLoop.cpp +++ b/llvm/lib/Fuzzer/FuzzerLoop.cpp @@ -153,6 +153,20 @@ void Fuzzer::InterruptCallback() { NO_SANITIZE_MEMORY void Fuzzer::AlarmCallback() { assert(Options.UnitTimeoutSec > 0); + if (InOOMState) { + Printf("==%d== ERROR: libFuzzer: out-of-memory (used: %zdMb; limit: %zdMb)\n", + GetPid(), GetPeakRSSMb(), Options.RssLimitMb); + Printf(" To change the out-of-memory limit use -rss_limit_mb=<N>\n"); + if (CurrentUnitSize && CurrentUnitData) { + DumpCurrentUnit("oom-"); + if (__sanitizer_print_stack_trace) + __sanitizer_print_stack_trace(); + } + Printf("SUMMARY: libFuzzer: out-of-memory\n"); + PrintFinalStats(); + _Exit(Options.ErrorExitCode); // Stop right now. + } + if (!CurrentUnitSize) return; // We have not started running units yet. size_t Seconds = @@ -176,15 +190,13 @@ void Fuzzer::AlarmCallback() { } } -void Fuzzer::RssLimitCallback(size_t RssPeakMb, size_t RssLimitMb) { - Printf("==%d== ERROR: libFuzzer: out-of-memory (used: %zdMb; limit: %zdMb)\n", - GetPid(), RssPeakMb, RssLimitMb); - Printf("*****************************************************************\n"); - Printf("** Experimental! TODO: dump the stack trace and the reproducer **\n"); - Printf("*****************************************************************\n"); - Printf("SUMMARY: libFuzzer: out-of-memory\n"); - PrintFinalStats(); - _Exit(Options.ErrorExitCode); // Stop right now. +void Fuzzer::RssLimitCallback() { + InOOMState = true; + SignalToMainThread(); + SleepSeconds(5); + Printf("Signal to main thread failed (non-linux?). Exiting.\n"); + _Exit(Options.ErrorExitCode); + return; } void Fuzzer::PrintStats(const char *Where, const char *End) { |