From 783f41e2c23d2b6711c2d03598e7dd6b99425250 Mon Sep 17 00:00:00 2001 From: Kostya Serebryany Date: Tue, 4 Oct 2016 06:08:46 +0000 Subject: [PATCH] [libFuzzer] remove dfsan support and some related stale code. This is not being used and as is is pretty weak anyway llvm-svn: 283187 --- lib/Fuzzer/FuzzerDFSan.h | 61 ----- lib/Fuzzer/FuzzerInternal.h | 1 - lib/Fuzzer/FuzzerLoop.cpp | 1 - lib/Fuzzer/FuzzerTraceState.cpp | 335 +-------------------------- lib/Fuzzer/test/CMakeLists.txt | 10 - lib/Fuzzer/test/dfsan/CMakeLists.txt | 19 -- lib/Fuzzer/test/fuzzer-dfsan.test | 16 -- lib/Fuzzer/test/lit.cfg | 6 - lib/Fuzzer/test/lit.site.cfg.in | 1 - 9 files changed, 1 insertion(+), 449 deletions(-) delete mode 100644 lib/Fuzzer/FuzzerDFSan.h delete mode 100644 lib/Fuzzer/test/dfsan/CMakeLists.txt delete mode 100644 lib/Fuzzer/test/fuzzer-dfsan.test diff --git a/lib/Fuzzer/FuzzerDFSan.h b/lib/Fuzzer/FuzzerDFSan.h deleted file mode 100644 index eb206ec61ce..00000000000 --- a/lib/Fuzzer/FuzzerDFSan.h +++ /dev/null @@ -1,61 +0,0 @@ -//===- FuzzerDFSan.h - Internal header for the Fuzzer -----------*- C++ -* ===// -// -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// -// DFSan interface. -//===----------------------------------------------------------------------===// - -#ifndef LLVM_FUZZER_DFSAN_H -#define LLVM_FUZZER_DFSAN_H - -#define LLVM_FUZZER_SUPPORTS_DFSAN 0 -#if defined(__has_include) -# if __has_include() -# if defined (__linux__) -# undef LLVM_FUZZER_SUPPORTS_DFSAN -# define LLVM_FUZZER_SUPPORTS_DFSAN 1 -# include -# endif // __linux__ -# endif -#endif // defined(__has_include) - -#if LLVM_FUZZER_SUPPORTS_DFSAN - -extern "C" { -__attribute__((weak)) -dfsan_label dfsan_create_label(const char *desc, void *userdata); -__attribute__((weak)) -void dfsan_set_label(dfsan_label label, void *addr, size_t size); -__attribute__((weak)) -void dfsan_add_label(dfsan_label label, void *addr, size_t size); -__attribute__((weak)) -const struct dfsan_label_info *dfsan_get_label_info(dfsan_label label); -__attribute__((weak)) -dfsan_label dfsan_read_label(const void *addr, size_t size); -} // extern "C" - -namespace fuzzer { -static bool ReallyHaveDFSan() { - return &dfsan_create_label != nullptr; -} -} // namespace fuzzer -#else -// When compiling with a compiler which does not support dfsan, -// this code is still expected to build (but not necessary work). -typedef unsigned short dfsan_label; -struct dfsan_label_info { - dfsan_label l1, l2; - const char *desc; - void *userdata; -}; -namespace fuzzer { -static bool ReallyHaveDFSan() { return false; } -} // namespace fuzzer - -#endif - -#endif // LLVM_FUZZER_DFSAN_H diff --git a/lib/Fuzzer/FuzzerInternal.h b/lib/Fuzzer/FuzzerInternal.h index ba538b89826..29e810b0f6d 100644 --- a/lib/Fuzzer/FuzzerInternal.h +++ b/lib/Fuzzer/FuzzerInternal.h @@ -62,7 +62,6 @@ public: void Loop(); void ShuffleAndMinimize(UnitVector *V); void InitializeTraceState(); - void AssignTaintLabels(uint8_t *Data, size_t Size); void RereadOutputCorpus(size_t MaxSize); size_t secondsSinceProcessStartUp() { diff --git a/lib/Fuzzer/FuzzerLoop.cpp b/lib/Fuzzer/FuzzerLoop.cpp index f2e0f243a1a..57dbb9fa427 100644 --- a/lib/Fuzzer/FuzzerLoop.cpp +++ b/lib/Fuzzer/FuzzerLoop.cpp @@ -470,7 +470,6 @@ void Fuzzer::ExecuteCallback(const uint8_t *Data, size_t Size) { memcpy(DataCopy, Data, Size); if (CurrentUnitData && CurrentUnitData != Data) memcpy(CurrentUnitData, Data, Size); - AssignTaintLabels(DataCopy, Size); CurrentUnitSize = Size; AllocTracer.Start(); UnitStartTime = system_clock::now(); diff --git a/lib/Fuzzer/FuzzerTraceState.cpp b/lib/Fuzzer/FuzzerTraceState.cpp index 97d5935008b..ace45279ae0 100644 --- a/lib/Fuzzer/FuzzerTraceState.cpp +++ b/lib/Fuzzer/FuzzerTraceState.cpp @@ -6,71 +6,9 @@ // License. See LICENSE.TXT for details. // //===----------------------------------------------------------------------===// -// This file implements a mutation algorithm based on instruction traces and -// on taint analysis feedback from DFSan. -// -// Instruction traces are special hooks inserted by the compiler around -// interesting instructions. Currently supported traces: -// * __sanitizer_cov_trace_cmp -- inserted before every ICMP instruction, -// receives the type, size and arguments of ICMP. -// -// Every time a traced event is intercepted we analyse the data involved -// in the event and suggest a mutation for future executions. -// For example if 4 bytes of data that derive from input bytes {4,5,6,7} -// are compared with a constant 12345, -// we try to insert 12345, 12344, 12346 into bytes -// {4,5,6,7} of the next fuzzed inputs. -// -// The fuzzer can work only with the traces, or with both traces and DFSan. -// -// DataFlowSanitizer (DFSan) is a tool for -// generalised dynamic data flow (taint) analysis: -// http://clang.llvm.org/docs/DataFlowSanitizer.html . -// -// The approach with DFSan-based fuzzing has some similarity to -// "Taint-based Directed Whitebox Fuzzing" -// by Vijay Ganesh & Tim Leek & Martin Rinard: -// http://dspace.mit.edu/openaccess-disseminate/1721.1/59320, -// but it uses a full blown LLVM IR taint analysis and separate instrumentation -// to analyze all of the "attack points" at once. -// -// Workflow with DFSan: -// * lib/Fuzzer/Fuzzer*.cpp is compiled w/o any instrumentation. -// * The code under test is compiled with DFSan *and* with instruction traces. -// * Every call to HOOK(a,b) is replaced by DFSan with -// __dfsw_HOOK(a, b, label(a), label(b)) so that __dfsw_HOOK -// gets all the taint labels for the arguments. -// * At the Fuzzer startup we assign a unique DFSan label -// to every byte of the input string (Fuzzer::CurrentUnitData) so that -// for any chunk of data we know which input bytes it has derived from. -// * The __dfsw_* functions (implemented in this file) record the -// parameters (i.e. the application data and the corresponding taint labels) -// in a global state. -// -// Parts of this code will not function when DFSan is not linked in. -// Instead of using ifdefs and thus requiring a separate build of lib/Fuzzer -// we redeclare the dfsan_* interface functions as weak and check if they -// are nullptr before calling. -// If this approach proves to be useful we may add attribute(weak) to the -// dfsan declarations in dfsan_interface.h -// -// This module is in the "proof of concept" stage. -// It is capable of solving only the simplest puzzles -// like test/dfsan/DFSanSimpleCmpTest.cpp. +// Data tracing. //===----------------------------------------------------------------------===// -/* Example of manual usage (-fsanitize=dataflow is optional): -( - cd $LLVM/lib/Fuzzer/ - clang -fPIC -c -g -O2 -std=c++11 Fuzzer*.cpp - clang++ -O0 -std=c++11 -fsanitize-coverage=edge,trace-cmp \ - -fsanitize=dataflow \ - test/SimpleCmpTest.cpp Fuzzer*.o - ./a.out -use_traces=1 -) -*/ - -#include "FuzzerDFSan.h" #include "FuzzerInternal.h" #include "FuzzerDictionary.h" #include "FuzzerMutate.h" @@ -83,90 +21,8 @@ #include #include -#if !LLVM_FUZZER_SUPPORTS_DFSAN -// Stubs for dfsan for platforms where dfsan does not exist and weak -// functions don't work. -extern "C" { -dfsan_label dfsan_create_label(const char *desc, void *userdata) { return 0; } -void dfsan_set_label(dfsan_label label, void *addr, size_t size) {} -void dfsan_add_label(dfsan_label label, void *addr, size_t size) {} -const struct dfsan_label_info *dfsan_get_label_info(dfsan_label label) { - return nullptr; -} -dfsan_label dfsan_read_label(const void *addr, size_t size) { return 0; } -} // extern "C" -#endif // !LLVM_FUZZER_SUPPORTS_DFSAN - namespace fuzzer { -// These values are copied from include/llvm/IR/InstrTypes.h. -// We do not include the LLVM headers here to remain independent. -// If these values ever change, an assertion in ComputeCmp will fail. -enum Predicate { - ICMP_EQ = 32, ///< equal - ICMP_NE = 33, ///< not equal - ICMP_UGT = 34, ///< unsigned greater than - ICMP_UGE = 35, ///< unsigned greater or equal - ICMP_ULT = 36, ///< unsigned less than - ICMP_ULE = 37, ///< unsigned less or equal - ICMP_SGT = 38, ///< signed greater than - ICMP_SGE = 39, ///< signed greater or equal - ICMP_SLT = 40, ///< signed less than - ICMP_SLE = 41, ///< signed less or equal -}; - -template -bool ComputeCmp(size_t CmpType, U Arg1, U Arg2) { - switch(CmpType) { - case ICMP_EQ : return Arg1 == Arg2; - case ICMP_NE : return Arg1 != Arg2; - case ICMP_UGT: return Arg1 > Arg2; - case ICMP_UGE: return Arg1 >= Arg2; - case ICMP_ULT: return Arg1 < Arg2; - case ICMP_ULE: return Arg1 <= Arg2; - case ICMP_SGT: return (S)Arg1 > (S)Arg2; - case ICMP_SGE: return (S)Arg1 >= (S)Arg2; - case ICMP_SLT: return (S)Arg1 < (S)Arg2; - case ICMP_SLE: return (S)Arg1 <= (S)Arg2; - default: assert(0 && "unsupported CmpType"); - } - return false; -} - -static bool ComputeCmp(size_t CmpSize, size_t CmpType, uint64_t Arg1, - uint64_t Arg2) { - if (CmpSize == 8) return ComputeCmp(CmpType, Arg1, Arg2); - if (CmpSize == 4) return ComputeCmp(CmpType, Arg1, Arg2); - if (CmpSize == 2) return ComputeCmp(CmpType, Arg1, Arg2); - if (CmpSize == 1) return ComputeCmp(CmpType, Arg1, Arg2); - // Other size, == - if (CmpType == ICMP_EQ) return Arg1 == Arg2; - // assert(0 && "unsupported cmp and type size combination"); - return true; -} - -// As a simplification we use the range of input bytes instead of a set of input -// bytes. -struct LabelRange { - uint16_t Beg, End; // Range is [Beg, End), thus Beg==End is an empty range. - - LabelRange(uint16_t Beg = 0, uint16_t End = 0) : Beg(Beg), End(End) {} - - static LabelRange Join(LabelRange LR1, LabelRange LR2) { - if (LR1.Beg == LR1.End) return LR2; - if (LR2.Beg == LR2.End) return LR1; - return {std::min(LR1.Beg, LR2.Beg), std::max(LR1.End, LR2.End)}; - } - LabelRange &Join(LabelRange LR) { - return *this = Join(*this, LR); - } - static LabelRange Singleton(const dfsan_label_info *LI) { - uint16_t Idx = (uint16_t)(uintptr_t)LI->userdata; - assert(Idx > 0); - return {(uint16_t)(Idx - 1), Idx}; - } -}; - // For now, very simple: put Size bytes of Data at position Pos. struct TraceBasedMutation { uint32_t Pos; @@ -189,17 +45,6 @@ public: const Fuzzer *F) : MD(MD), Options(Options), F(F) {} - LabelRange GetLabelRange(dfsan_label L); - void DFSanCmpCallback(uintptr_t PC, size_t CmpSize, size_t CmpType, - uint64_t Arg1, uint64_t Arg2, dfsan_label L1, - dfsan_label L2); - void DFSanMemcmpCallback(size_t CmpSize, const uint8_t *Data1, - const uint8_t *Data2, dfsan_label L1, - dfsan_label L2); - void DFSanSwitchCallback(uint64_t PC, size_t ValSizeInBits, uint64_t Val, - size_t NumCases, uint64_t *Cases, dfsan_label L); - void TraceCmpCallback(uintptr_t PC, size_t CmpSize, size_t CmpType, - uint64_t Arg1, uint64_t Arg2); void TraceMemcmpCallback(size_t CmpSize, const uint8_t *Data1, const uint8_t *Data2); @@ -270,17 +115,6 @@ public: InterestingWords.insert(W); } - void EnsureDfsanLabels(size_t Size) { - for (; LastDfsanLabel < Size; LastDfsanLabel++) { - dfsan_label L = dfsan_create_label("input", (void *)(LastDfsanLabel + 1)); - // We assume that no one else has called dfsan_create_label before. - if (L != LastDfsanLabel + 1) { - Printf("DFSan labels are not starting from 1, exiting\n"); - exit(1); - } - } - } - private: bool IsTwoByteData(uint64_t Data) { int64_t Signed = static_cast(Data); @@ -308,8 +142,6 @@ public: TraceBasedMutation Mutations[kMaxMutations]; // TODO: std::set is too inefficient, need to have a custom DS here. std::set InterestingWords; - LabelRange LabelRanges[1 << (sizeof(dfsan_label) * 8)]; - size_t LastDfsanLabel = 0; MutationDispatcher &MD; const FuzzingOptions Options; const Fuzzer *F; @@ -317,93 +149,6 @@ public: size_t AutoDictAdds = 0; }; - -LabelRange TraceState::GetLabelRange(dfsan_label L) { - LabelRange &LR = LabelRanges[L]; - if (LR.Beg < LR.End || L == 0) - return LR; - const dfsan_label_info *LI = dfsan_get_label_info(L); - if (LI->l1 || LI->l2) - return LR = LabelRange::Join(GetLabelRange(LI->l1), GetLabelRange(LI->l2)); - return LR = LabelRange::Singleton(LI); -} - -void TraceState::DFSanCmpCallback(uintptr_t PC, size_t CmpSize, size_t CmpType, - uint64_t Arg1, uint64_t Arg2, dfsan_label L1, - dfsan_label L2) { - assert(ReallyHaveDFSan()); - if (!F->InFuzzingThread()) return; - if (L1 == 0 && L2 == 0) - return; // Not actionable. - if (L1 != 0 && L2 != 0) - return; // Probably still actionable. - bool Res = ComputeCmp(CmpSize, CmpType, Arg1, Arg2); - uint64_t Data = L1 ? Arg2 : Arg1; - LabelRange LR = L1 ? GetLabelRange(L1) : GetLabelRange(L2); - - for (size_t Pos = LR.Beg; Pos + CmpSize <= LR.End; Pos++) { - AddMutation(Pos, CmpSize, Data); - AddMutation(Pos, CmpSize, Data + 1); - AddMutation(Pos, CmpSize, Data - 1); - } - - if (CmpSize > (size_t)(LR.End - LR.Beg)) - AddMutation(LR.Beg, (unsigned)(LR.End - LR.Beg), Data); - - - if (Options.Verbosity >= 3) - Printf("DFSanCmpCallback: PC %lx S %zd T %zd A1 %llx A2 %llx R %d L1 %d L2 " - "%d MU %zd\n", - PC, CmpSize, CmpType, Arg1, Arg2, Res, L1, L2, NumMutations); -} - -void TraceState::DFSanMemcmpCallback(size_t CmpSize, const uint8_t *Data1, - const uint8_t *Data2, dfsan_label L1, - dfsan_label L2) { - - assert(ReallyHaveDFSan()); - if (!RecordingMemcmp || !F->InFuzzingThread()) return; - if (L1 == 0 && L2 == 0) - return; // Not actionable. - if (L1 != 0 && L2 != 0) - return; // Probably still actionable. - - const uint8_t *Data = L1 ? Data2 : Data1; - LabelRange LR = L1 ? GetLabelRange(L1) : GetLabelRange(L2); - for (size_t Pos = LR.Beg; Pos + CmpSize <= LR.End; Pos++) { - AddMutation(Pos, CmpSize, Data); - if (Options.Verbosity >= 3) - Printf("DFSanMemcmpCallback: Pos %d Size %d\n", Pos, CmpSize); - } -} - -void TraceState::DFSanSwitchCallback(uint64_t PC, size_t ValSizeInBits, - uint64_t Val, size_t NumCases, - uint64_t *Cases, dfsan_label L) { - assert(ReallyHaveDFSan()); - if (!F->InFuzzingThread()) return; - if (!L) return; // Not actionable. - LabelRange LR = GetLabelRange(L); - size_t ValSize = ValSizeInBits / 8; - bool TryShort = IsTwoByteData(Val); - for (size_t i = 0; i < NumCases; i++) - TryShort &= IsTwoByteData(Cases[i]); - - for (size_t Pos = LR.Beg; Pos + ValSize <= LR.End; Pos++) - for (size_t i = 0; i < NumCases; i++) - AddMutation(Pos, ValSize, Cases[i]); - - if (TryShort) - for (size_t Pos = LR.Beg; Pos + 2 <= LR.End; Pos++) - for (size_t i = 0; i < NumCases; i++) - AddMutation(Pos, 2, Cases[i]); - - if (Options.Verbosity >= 3) - Printf("DFSanSwitchCallback: PC %lx Val %zd SZ %zd # %zd L %d: {%d, %d} " - "TryShort %d\n", - PC, Val, ValSize, NumCases, L, LR.Beg, LR.End, TryShort); -} - int TraceState::TryToAddDesiredData(uint64_t PresentData, uint64_t DesiredData, size_t DataSize) { if (NumMutations >= kMaxMutations || !WantToHandleOneMoreMutation()) return 0; @@ -449,22 +194,6 @@ int TraceState::TryToAddDesiredData(const uint8_t *PresentData, return Res; } -void TraceState::TraceCmpCallback(uintptr_t PC, size_t CmpSize, size_t CmpType, - uint64_t Arg1, uint64_t Arg2) { - if (!F->InFuzzingThread()) return; - if ((CmpType == ICMP_EQ || CmpType == ICMP_NE) && Arg1 == Arg2) - return; // No reason to mutate. - int Added = 0; - Added += TryToAddDesiredData(Arg1, Arg2, CmpSize); - Added += TryToAddDesiredData(Arg2, Arg1, CmpSize); - if (!Added && CmpSize == 4 && IsTwoByteData(Arg1) && IsTwoByteData(Arg2)) { - Added += TryToAddDesiredData(Arg1, Arg2, 2); - Added += TryToAddDesiredData(Arg2, Arg1, 2); - } - if (Options.Verbosity >= 3 && Added) - Printf("TraceCmp %zd/%zd: %p %zd %zd\n", CmpSize, CmpType, PC, Arg1, Arg2); -} - void TraceState::TraceMemcmpCallback(size_t CmpSize, const uint8_t *Data1, const uint8_t *Data2) { if (!RecordingMemcmp || !F->InFuzzingThread()) return; @@ -511,14 +240,6 @@ void Fuzzer::StopTraceRecording() { TS->StopTraceRecording(); } -void Fuzzer::AssignTaintLabels(uint8_t *Data, size_t Size) { - if (!Options.UseMemcmp) return; - if (!ReallyHaveDFSan()) return; - TS->EnsureDfsanLabels(Size); - for (size_t i = 0; i < Size; i++) - dfsan_set_label(i + 1, &Data[i], 1); -} - void Fuzzer::InitializeTraceState() { if (!Options.UseMemcmp) return; TS = new TraceState(MD, Options, this); @@ -598,60 +319,6 @@ using fuzzer::TS; using fuzzer::RecordingMemcmp; extern "C" { -void __dfsw___sanitizer_cov_trace_cmp(uint64_t SizeAndType, uint64_t Arg1, - uint64_t Arg2, dfsan_label L0, - dfsan_label L1, dfsan_label L2) { -} - -#define DFSAN_CMP_CALLBACK(N) \ - void __dfsw___sanitizer_cov_trace_cmp##N(uint64_t Arg1, uint64_t Arg2, \ - dfsan_label L1, dfsan_label L2) { \ - } - -DFSAN_CMP_CALLBACK(1) -DFSAN_CMP_CALLBACK(2) -DFSAN_CMP_CALLBACK(4) -DFSAN_CMP_CALLBACK(8) -#undef DFSAN_CMP_CALLBACK - -void __dfsw___sanitizer_cov_trace_switch(uint64_t Val, uint64_t *Cases, - dfsan_label L1, dfsan_label L2) { -} - -void dfsan_weak_hook_memcmp(void *caller_pc, const void *s1, const void *s2, - size_t n, dfsan_label s1_label, - dfsan_label s2_label, dfsan_label n_label) { - if (!RecordingMemcmp) return; - dfsan_label L1 = dfsan_read_label(s1, n); - dfsan_label L2 = dfsan_read_label(s2, n); - TS->DFSanMemcmpCallback(n, reinterpret_cast(s1), - reinterpret_cast(s2), L1, L2); -} - -void dfsan_weak_hook_strncmp(void *caller_pc, const char *s1, const char *s2, - size_t n, dfsan_label s1_label, - dfsan_label s2_label, dfsan_label n_label) { - if (!RecordingMemcmp) return; - n = std::min(n, fuzzer::InternalStrnlen(s1, n)); - n = std::min(n, fuzzer::InternalStrnlen(s2, n)); - dfsan_label L1 = dfsan_read_label(s1, n); - dfsan_label L2 = dfsan_read_label(s2, n); - TS->DFSanMemcmpCallback(n, reinterpret_cast(s1), - reinterpret_cast(s2), L1, L2); -} - -void dfsan_weak_hook_strcmp(void *caller_pc, const char *s1, const char *s2, - dfsan_label s1_label, dfsan_label s2_label) { - if (!RecordingMemcmp) return; - size_t Len1 = strlen(s1); - size_t Len2 = strlen(s2); - size_t N = std::min(Len1, Len2); - if (N <= 1) return; // Not interesting. - dfsan_label L1 = dfsan_read_label(s1, Len1); - dfsan_label L2 = dfsan_read_label(s2, Len2); - TS->DFSanMemcmpCallback(N, reinterpret_cast(s1), - reinterpret_cast(s2), L1, L2); -} // We may need to avoid defining weak hooks to stay compatible with older clang. #ifndef LLVM_FUZZER_DEFINES_SANITIZER_WEAK_HOOOKS diff --git a/lib/Fuzzer/test/CMakeLists.txt b/lib/Fuzzer/test/CMakeLists.txt index 1406379b097..bf8e55274bb 100644 --- a/lib/Fuzzer/test/CMakeLists.txt +++ b/lib/Fuzzer/test/CMakeLists.txt @@ -152,16 +152,6 @@ set_target_properties(LLVMFuzzer-Unittest include_directories(..) -if(APPLE) - message(WARNING "DataflowSanitizer is not supported on Apple platforms." - " Building and running LibFuzzer DataflowSanitizer tests is disabled." - ) - set(HAS_DFSAN 0) -else() - set(HAS_DFSAN 1) - add_subdirectory(dfsan) -endif() - add_subdirectory(uninstrumented) add_subdirectory(no-coverage) add_subdirectory(ubsan) diff --git a/lib/Fuzzer/test/dfsan/CMakeLists.txt b/lib/Fuzzer/test/dfsan/CMakeLists.txt deleted file mode 100644 index 2a4dc18bfee..00000000000 --- a/lib/Fuzzer/test/dfsan/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -# These tests depend on both coverage and dfsan instrumentation. - -set(CMAKE_CXX_FLAGS - "${LIBFUZZER_FLAGS_BASE} -fno-sanitize=all -fsanitize=dataflow") - -set(DFSanTests - MemcmpTest - SimpleCmpTest - StrcmpTest - StrncmpTest - SwitchTest - ) - -foreach(Test ${DFSanTests}) - add_libfuzzer_test(${Test}-DFSan SOURCES ../${Test}.cpp) -endforeach() - -# Propagate value into parent directory -set(TestBinaries ${TestBinaries} PARENT_SCOPE) diff --git a/lib/Fuzzer/test/fuzzer-dfsan.test b/lib/Fuzzer/test/fuzzer-dfsan.test deleted file mode 100644 index a1a22485f45..00000000000 --- a/lib/Fuzzer/test/fuzzer-dfsan.test +++ /dev/null @@ -1,16 +0,0 @@ -REQUIRES: dfsan -CHECK1: BINGO -CHECK2: BINGO -CHECK3: BINGO -CHECK4: BINGO - -CHECK_DFSanMemcmpCallback: DFSanMemcmpCallback: Pos - -RUN: not LLVMFuzzer-MemcmpTest-DFSan -use_traces=1 -seed=1 -runs=100000 -timeout=5 2>&1 | FileCheck %s --check-prefix=CHECK2 -RUN: LLVMFuzzer-MemcmpTest-DFSan -use_traces=1 -seed=1 -runs=2 -timeout=5 -verbosity=3 2>&1 | FileCheck %s -check-prefix=CHECK_DFSanMemcmpCallback - -RUN: not LLVMFuzzer-StrncmpTest-DFSan -use_traces=1 -seed=1 -runs=10000 -timeout=5 2>&1 | FileCheck %s --check-prefix=CHECK3 -RUN: LLVMFuzzer-StrncmpTest-DFSan -use_traces=1 -seed=1 -runs=2 -timeout=5 -verbosity=3 2>&1 | FileCheck %s -check-prefix=CHECK_DFSanMemcmpCallback - -RUN: not LLVMFuzzer-StrcmpTest-DFSan -use_traces=1 -seed=1 -runs=10000 -timeout=5 2>&1 | FileCheck %s --check-prefix=CHECK3 -RUN: LLVMFuzzer-StrcmpTest-DFSan -use_traces=1 -seed=1 -runs=2 -timeout=5 -verbosity=3 2>&1 | FileCheck %s -check-prefix=CHECK_DFSanMemcmpCallback diff --git a/lib/Fuzzer/test/lit.cfg b/lib/Fuzzer/test/lit.cfg index e262e3c2585..745af0c3824 100644 --- a/lib/Fuzzer/test/lit.cfg +++ b/lib/Fuzzer/test/lit.cfg @@ -14,12 +14,6 @@ path = os.path.pathsep.join((llvm_tools_dir, config.test_exec_root, config.environment['PATH'])) config.environment['PATH'] = path -if config.has_dfsan: - lit_config.note('dfsan feature available') - config.available_features.add('dfsan') -else: - lit_config.note('dfsan feature unavailable') - if config.has_lsan: lit_config.note('lsan feature available') config.available_features.add('lsan') diff --git a/lib/Fuzzer/test/lit.site.cfg.in b/lib/Fuzzer/test/lit.site.cfg.in index 95ad6d0ab17..03e86c487ca 100644 --- a/lib/Fuzzer/test/lit.site.cfg.in +++ b/lib/Fuzzer/test/lit.site.cfg.in @@ -1,5 +1,4 @@ config.test_exec_root = "@CMAKE_CURRENT_BINARY_DIR@" config.llvm_tools_dir = "@LLVM_TOOLS_DIR@" -config.has_dfsan = True if @HAS_DFSAN@ == 1 else False config.has_lsan = True if @HAS_LSAN@ == 1 else False lit_config.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/lit.cfg")