diff options
| author | Max Moroz <mmoroz@chromium.org> | 2018-08-02 22:30:03 +0000 |
|---|---|---|
| committer | Max Moroz <mmoroz@chromium.org> | 2018-08-02 22:30:03 +0000 |
| commit | 27f6922bac686ad0c060989e480e71495e028199 (patch) | |
| tree | b41517eab93bd19bbd78a26bc7e396702e8aeef2 /lib/fuzzer | |
| parent | e1ff3d6417ef53be34c67ad9bc5a128b243c3a97 (diff) | |
| download | compiler-rt-27f6922bac686ad0c060989e480e71495e028199.tar.gz | |
[libFuzzer] Initial implementation of weighted mutation leveraging during runtime.
Summary:
Added functions that calculate stats while fuzz targets are running and give
mutations weight based on how much new coverage they provide, and choose better
performing mutations more often.
Patch by Kodé Williams (@kodewilliams).
Reviewers: Dor1s, metzman, morehouse
Reviewed By: Dor1s, morehouse
Subscribers: delcypher, kcc, llvm-commits, #sanitizers
Differential Revision: https://reviews.llvm.org/D49621
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@338776 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/fuzzer')
| -rw-r--r-- | lib/fuzzer/FuzzerDriver.cpp | 1 | ||||
| -rw-r--r-- | lib/fuzzer/FuzzerFlags.def | 2 | ||||
| -rw-r--r-- | lib/fuzzer/FuzzerLoop.cpp | 4 | ||||
| -rw-r--r-- | lib/fuzzer/FuzzerMutate.cpp | 76 | ||||
| -rw-r--r-- | lib/fuzzer/FuzzerMutate.h | 19 | ||||
| -rw-r--r-- | lib/fuzzer/FuzzerOptions.h | 1 |
6 files changed, 76 insertions, 27 deletions
diff --git a/lib/fuzzer/FuzzerDriver.cpp b/lib/fuzzer/FuzzerDriver.cpp index 783474a39..d11f9a606 100644 --- a/lib/fuzzer/FuzzerDriver.cpp +++ b/lib/fuzzer/FuzzerDriver.cpp @@ -616,6 +616,7 @@ int FuzzerDriver(int *argc, char ***argv, UserCallback Callback) { Options.PrintNewCovFuncs = Flags.print_funcs; Options.PrintFinalStats = Flags.print_final_stats; Options.PrintMutationStats = Flags.print_mutation_stats; + Options.UseWeightedMutations = Flags.use_weighted_mutations; Options.PrintCorpusStats = Flags.print_corpus_stats; Options.PrintCoverage = Flags.print_coverage; Options.PrintUnstableStats = Flags.print_unstable_stats; diff --git a/lib/fuzzer/FuzzerFlags.def b/lib/fuzzer/FuzzerFlags.def index ba04bc25f..258427c3f 100644 --- a/lib/fuzzer/FuzzerFlags.def +++ b/lib/fuzzer/FuzzerFlags.def @@ -163,3 +163,5 @@ FUZZER_FLAG_INT(analyze_dict, 0, "Experimental") FUZZER_DEPRECATED_FLAG(use_clang_coverage) FUZZER_FLAG_STRING(data_flow_trace, "Experimental: use the data flow trace") FUZZER_FLAG_INT(print_mutation_stats, 0, "Experimental") +FUZZER_FLAG_INT(use_weighted_mutations, 0, "Experimental: If 1, fuzzing will " + "favor mutations that perform better during runtime.") diff --git a/lib/fuzzer/FuzzerLoop.cpp b/lib/fuzzer/FuzzerLoop.cpp index 4bc88365a..23fcb8a40 100644 --- a/lib/fuzzer/FuzzerLoop.cpp +++ b/lib/fuzzer/FuzzerLoop.cpp @@ -38,6 +38,7 @@ namespace fuzzer { static const size_t kMaxUnitSizeToPrint = 256; +static const size_t kUpdateMutationWeightRuns = 10000; thread_local bool Fuzzer::IsMyThread; @@ -554,6 +555,9 @@ static bool LooseMemeq(const uint8_t *A, const uint8_t *B, size_t Size) { void Fuzzer::ExecuteCallback(const uint8_t *Data, size_t Size) { TPC.RecordInitialStack(); + if (Options.UseWeightedMutations && + TotalNumberOfRuns % kUpdateMutationWeightRuns == 0) + MD.UpdateDistribution(); TotalNumberOfRuns++; assert(InFuzzingThread()); if (SMR.IsClient()) diff --git a/lib/fuzzer/FuzzerMutate.cpp b/lib/fuzzer/FuzzerMutate.cpp index ff076cca6..fac3c7afb 100644 --- a/lib/fuzzer/FuzzerMutate.cpp +++ b/lib/fuzzer/FuzzerMutate.cpp @@ -30,36 +30,41 @@ MutationDispatcher::MutationDispatcher(Random &Rand, DefaultMutators.insert( DefaultMutators.begin(), { - {&MutationDispatcher::Mutate_EraseBytes, "EraseBytes", 0, 0}, - {&MutationDispatcher::Mutate_InsertByte, "InsertByte", 0, 0}, + // Initialize useful and total mutation counts as 1 in order to + // have mutation stats (i.e. weights) with equal non-zero values. + {&MutationDispatcher::Mutate_EraseBytes, "EraseBytes", 1, 1}, + {&MutationDispatcher::Mutate_InsertByte, "InsertByte", 1, 1}, {&MutationDispatcher::Mutate_InsertRepeatedBytes, - "InsertRepeatedBytes", 0, 0}, - {&MutationDispatcher::Mutate_ChangeByte, "ChangeByte", 0, 0}, - {&MutationDispatcher::Mutate_ChangeBit, "ChangeBit", 0, 0}, - {&MutationDispatcher::Mutate_ShuffleBytes, "ShuffleBytes", 0, 0}, - {&MutationDispatcher::Mutate_ChangeASCIIInteger, "ChangeASCIIInt", 0, - 0}, - {&MutationDispatcher::Mutate_ChangeBinaryInteger, "ChangeBinInt", 0, - 0}, - {&MutationDispatcher::Mutate_CopyPart, "CopyPart", 0, 0}, - {&MutationDispatcher::Mutate_CrossOver, "CrossOver", 0, 0}, + "InsertRepeatedBytes", 1, 1}, + {&MutationDispatcher::Mutate_ChangeByte, "ChangeByte", 1, 1}, + {&MutationDispatcher::Mutate_ChangeBit, "ChangeBit", 1, 1}, + {&MutationDispatcher::Mutate_ShuffleBytes, "ShuffleBytes", 1, 1}, + {&MutationDispatcher::Mutate_ChangeASCIIInteger, "ChangeASCIIInt", 1, + 1}, + {&MutationDispatcher::Mutate_ChangeBinaryInteger, "ChangeBinInt", 1, + 1}, + {&MutationDispatcher::Mutate_CopyPart, "CopyPart", 1, 1}, + {&MutationDispatcher::Mutate_CrossOver, "CrossOver", 1, 1}, {&MutationDispatcher::Mutate_AddWordFromManualDictionary, - "ManualDict", 0, 0}, + "ManualDict", 1, 1}, {&MutationDispatcher::Mutate_AddWordFromPersistentAutoDictionary, - "PersAutoDict", 0, 0}, + "PersAutoDict", 1, 1}, }); if(Options.UseCmp) DefaultMutators.push_back( - {&MutationDispatcher::Mutate_AddWordFromTORC, "CMP", 0, 0}); + {&MutationDispatcher::Mutate_AddWordFromTORC, "CMP", 1, 1}); if (EF->LLVMFuzzerCustomMutator) - Mutators.push_back({&MutationDispatcher::Mutate_Custom, "Custom", 0, 0}); + Mutators.push_back({&MutationDispatcher::Mutate_Custom, "Custom", 1, 1}); else Mutators = DefaultMutators; if (EF->LLVMFuzzerCustomCrossOver) Mutators.push_back( - {&MutationDispatcher::Mutate_CustomCrossOver, "CustomCrossOver", 0, 0}); + {&MutationDispatcher::Mutate_CustomCrossOver, "CustomCrossOver", 1, 1}); + + // For weighted mutation selection, init with uniform weights distribution. + Stats.resize(Mutators.size()); } static char RandCh(Random &Rand) { @@ -514,8 +519,14 @@ size_t MutationDispatcher::MutateImpl(uint8_t *Data, size_t Size, // Some mutations may fail (e.g. can't insert more bytes if Size == MaxSize), // in which case they will return 0. // Try several times before returning un-mutated data. + Mutator *M = nullptr; for (int Iter = 0; Iter < 100; Iter++) { - auto M = &Mutators[Rand(Mutators.size())]; + // Even when using weighted mutations, fallback to the default selection in + // 20% of cases. + if (Options.UseWeightedMutations && Rand(5)) + M = &Mutators[WeightedIndex()]; + else + M = &Mutators[Rand(Mutators.size())]; size_t NewSize = (this->*(M->Fn))(Data, Size, MaxSize); if (NewSize && NewSize <= MaxSize) { if (Options.OnlyASCII) @@ -568,15 +579,28 @@ void MutationDispatcher::RecordUsefulMutations() { void MutationDispatcher::PrintMutationStats() { Printf("\nstat::mutation_usefulness: "); - for (size_t i = 0; i < Mutators.size(); i++) { - double UsefulPercentage = - Mutators[i].TotalCount - ? (100.0 * Mutators[i].UsefulCount) / Mutators[i].TotalCount - : 0; - Printf("%.3f", UsefulPercentage); - if (i < Mutators.size() - 1) Printf(","); + UpdateMutationStats(); + for (size_t i = 0; i < Stats.size(); i++) { + Printf("%.3f", 100 * Stats[i]); + if (i < Stats.size() - 1) + Printf(","); + else + Printf("\n"); } - Printf("\n"); } +void MutationDispatcher::UpdateMutationStats() { + // Calculate usefulness statistic for each mutation + for (size_t i = 0; i < Stats.size(); i++) + Stats[i] = + static_cast<double>(Mutators[i].UsefulCount) / Mutators[i].TotalCount; +} + +void MutationDispatcher::UpdateDistribution() { + UpdateMutationStats(); + Distribution = std::discrete_distribution<size_t>(Stats.begin(), Stats.end()); +} + +size_t MutationDispatcher::WeightedIndex() { return Distribution(GetRand()); } + } // namespace fuzzer diff --git a/lib/fuzzer/FuzzerMutate.h b/lib/fuzzer/FuzzerMutate.h index 828ecc13d..d89667cc4 100644 --- a/lib/fuzzer/FuzzerMutate.h +++ b/lib/fuzzer/FuzzerMutate.h @@ -93,9 +93,22 @@ public: Random &GetRand() { return Rand; } + /// Records tally of mutations resulting in new coverage, for usefulness + /// metric. + void RecordUsefulMutations(); + + /// Outputs usefulness stats on command line if option is enabled. void PrintMutationStats(); - void RecordUsefulMutations(); + /// Recalculates mutation stats based on latest run data. + void UpdateMutationStats(); + + /// Sets weights based on mutation performance during fuzzer run. + void UpdateDistribution(); + + /// Returns the index of a mutation based on how useful it has been. + /// Favors mutations with higher usefulness ratios but can return any index. + size_t WeightedIndex(); private: struct Mutator { @@ -156,6 +169,10 @@ public: Vector<Mutator> Mutators; Vector<Mutator> DefaultMutators; + + // Used to weight mutations based on usefulness. + Vector<double> Stats; + std::discrete_distribution<size_t> Distribution; }; } // namespace fuzzer diff --git a/lib/fuzzer/FuzzerOptions.h b/lib/fuzzer/FuzzerOptions.h index ce39c0876..82855ce0b 100644 --- a/lib/fuzzer/FuzzerOptions.h +++ b/lib/fuzzer/FuzzerOptions.h @@ -53,6 +53,7 @@ struct FuzzingOptions { int PrintNewCovFuncs = 0; bool PrintFinalStats = false; bool PrintMutationStats = false; + bool UseWeightedMutations = false; bool PrintCorpusStats = false; bool PrintCoverage = false; bool PrintUnstableStats = false; |
