From: Vitaly Buka <vitalybuka@google.com>
Date: Tue, 14 Jun 2016 22:09:00 +0000 (+0000)
Subject: Revert "Enable libFuzzer's afl_driver to append stderr to a file."
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=93cdb4b527dd7d5e6af5577e9c22cf553a1c30e7;p=llvm

Revert "Enable libFuzzer's afl_driver to append stderr to a file."

Crashes with AddressSanitizer: SEGV on unknown address
http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-fuzzer/builds/9924/steps/annotate/logs/stdio

This reverts commit r272706.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@272726 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Fuzzer/afl/afl_driver.cpp b/lib/Fuzzer/afl/afl_driver.cpp
index 228317ca9e3..63aebab469c 100644
--- a/lib/Fuzzer/afl/afl_driver.cpp
+++ b/lib/Fuzzer/afl/afl_driver.cpp
@@ -60,25 +60,6 @@ static volatile char suppress_warning1 = AFL_DEFER_FORKSVR[0];
 static const size_t kMaxAflInputSize = 1 << 20;
 static uint8_t AflInputBuf[kMaxAflInputSize];
 
-// If the user asks us to duplicate stderr, then do it.
-static void maybe_duplicate_stderr() {
-  char* stderr_duplicate_filename =
-      getenv("AFL_DRIVER_STDERR_DUPLICATE_FILENAME");
-
-  if (!stderr_duplicate_filename)
-    return;
-
-  FILE* stderr_duplicate_stream =
-      freopen(stderr_duplicate_filename, "a+", stderr);
-
-  if (!stderr_duplicate_stream) {
-    fprintf(stderr,
-            "Failed to duplicate stderr to AFL_DRIVER_STDERR_DUPLICATE_FILENAME"
-            );
-    abort();
-  }
-}
-
 int main(int argc, char **argv) {
   fprintf(stderr, "Running in AFl-fuzz mode\nUsage:\n"
                   "afl-fuzz [afl-flags] %s [N] "
@@ -89,8 +70,6 @@ int main(int argc, char **argv) {
     LLVMFuzzerInitialize(&argc, &argv);
   // Do any other expensive one-time initialization here.
 
-  maybe_duplicate_stderr();
-
   __afl_manual_init();
 
   int N = 1000;
diff --git a/lib/Fuzzer/test/AFLDriverTest.cpp b/lib/Fuzzer/test/AFLDriverTest.cpp
deleted file mode 100644
index 9ae18cb6cb9..00000000000
--- a/lib/Fuzzer/test/AFLDriverTest.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <stdint.h>
-#include <stdlib.h>
-
-extern "C" void __afl_manual_init() {}
-
-extern "C" int __afl_persistent_loop(unsigned int) {
-  return 0;
-}
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
-  return 0;
-}
diff --git a/lib/Fuzzer/test/CMakeLists.txt b/lib/Fuzzer/test/CMakeLists.txt
index c5520b33909..9f95657b978 100644
--- a/lib/Fuzzer/test/CMakeLists.txt
+++ b/lib/Fuzzer/test/CMakeLists.txt
@@ -109,19 +109,6 @@ foreach(Test ${Tests})
   add_libfuzzer_test(${Test} SOURCES ${Test}.cpp)
 endforeach()
 
-###############################################################################
-# AFL Driver test
-###############################################################################
-
-add_executable(AFLDriverTest
-  AFLDriverTest.cpp ../afl/afl_driver.cpp)
-
-set_target_properties(AFLDriverTest
-    PROPERTIES RUNTIME_OUTPUT_DIRECTORY
-    "${CMAKE_BINARY_DIR}/lib/Fuzzer/test"
-    )
-set(TestBinaries ${TestBinaries} AFLDriverTest)
-
 ###############################################################################
 # Unit tests
 ###############################################################################
diff --git a/lib/Fuzzer/test/afl-driver.test b/lib/Fuzzer/test/afl-driver.test
deleted file mode 100644
index 6cff8e34ec3..00000000000
--- a/lib/Fuzzer/test/afl-driver.test
+++ /dev/null
@@ -1,10 +0,0 @@
-; Test that not specifying a file isn't broken.
-RUN: unset AFL_DRIVER_STDERR_DUPLICATE_FILENAME
-RUN: AFLDriverTest
-
-; Test that specifying an invalid file causes a crash.
-RUN: AFL_DRIVER_STDERR_DUPLICATE_FILENAME="%T" not --crash AFLDriverTest
-
-; Test that a file is created when specified as the duplicate stderr.
-RUN: AFL_DRIVER_STDERR_DUPLICATE_FILENAME=%t AFLDriverTest
-RUN: stat %t