Add support for fuzzing with AFL

Reviewed-by: Ben Laurie <ben@links.org>
MR: #2740

diff --git a/Configure b/Configure
index e8fc933872607ef7f9ef930aaa17df5f7747e1b0..3064151fe4baf60057992b11b4557a7ae2426a31 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -301,7 +301,8 @@ my @disablables = (
     "engine",
     "err",
     "filenames",
-    "fuzz",
+    "fuzz-libfuzzer",
+    "fuzz-afl",
     "gost",
     "heartbeats",
     "hw(-.+)?",
@@ -365,7 +366,8 @@ our %disabled = ( # "what"         => "comment"
                   "asan"               => "default",
                  "ec_nistp_64_gcc_128" => "default",
                  "egd"                 => "default",
-                 "fuzz"                => "default",
+                 "fuzz-libfuzzer"      => "default",
+                 "fuzz-afl"            => "default",
                  "md2"                 => "default",
                  "rc5"                 => "default",
                  "sctp"                => "default",
@@ -698,6 +700,14 @@ foreach (@argvcopy)
                        {
                        $withargs{zlib_include}=$1;
                        }
+               elsif (/^--with-fuzzer-lib=(.*)$/)
+                       {
+                       $withargs{fuzzer_lib}=$1;
+                       }
+               elsif (/^--with-fuzzer-include=(.*)$/)
+                       {
+                       $withargs{fuzzer_include}=$1;
+                       }
                elsif (/^--with-fipslibdir=(.*)$/)
                        {
                        $config{fipslibdir}="$1/";
@@ -1042,11 +1052,15 @@ if ($disabled{"dynamic-engine"}) {
         $config{dynamic_engines} = 1;
 }
 
-unless ($disabled{fuzz}) {
+unless ($disabled{"fuzz-libfuzzer"}) {
     push @{$config{dirs}}, "fuzz";
     $config{cflags} .= "-fsanitize-coverage=edge,indirect-calls ";
 }
 
+unless ($disabled{"fuzz-afl"}) {
+    push @{$config{dirs}}, "fuzz";
+}
+
 unless ($disabled{asan}) {
     $config{cflags} .= "-fsanitize=address ";
 }
@@ -1379,6 +1393,7 @@ if ($builder eq "unified") {
             $template->fill_in(HASH => { config => \%config,
                                          target => \%target,
                                          disabled => \%disabled,
+                                         withargs => \%withargs,
                                          builddir => abs2rel($buildd, $blddir),
                                          sourcedir => abs2rel($sourced, $blddir),
                                          buildtop => abs2rel($blddir, $blddir),

diff --git a/fuzz/README.md b/fuzz/README.md
index 9b6d7d7980d756f7df774823feeb93a07462ca7d..e9ec88b8c6b90c2d2621a1e8bf1e03d2a7838c37 100644 (file)
--- a/fuzz/README.md
+++ b/fuzz/README.md
@@ -1,5 +1,8 @@
 # I Can Haz Fuzz?
 
+LibFuzzer
+=========
+
 Or, how to fuzz OpenSSL with [libfuzzer](llvm.org/docs/LibFuzzer.html).
 
 Starting from a vanilla+OpenSSH server Ubuntu install.
@@ -32,7 +35,10 @@ https://github.com/llvm-mirror/llvm/tree/master/lib/Fuzzer if you prefer):
 
 Configure for fuzzing:
 
-    $ CC=clang ./config enable-fuzz enable-asan enable-ubsan no-shared
+    $ CC=clang ./config enable-fuzz-libfuzzer \
+            --with-fuzzer-include=../../svn-work/Fuzzer \
+            --with-fuzzer-lib=../../svn-work/Fuzzer/libFuzzer \
+            enable-asan enable-ubsan no-shared
     $ sudo apt-get install make
     $ LDCMD=clang++ make -j
     $ fuzz/helper.py <fuzzer> <arguments>
@@ -45,3 +51,20 @@ If you get a crash, you should find a corresponding input file in
 `fuzz/corpora/<fuzzer>-crash/`. You can reproduce the crash with
 
     $ fuzz/<fuzzer> <crashfile>
+
+AFL
+===
+
+Configure for fuzzing:
+
+    $ sudo apt-get install afl-clang
+    $ CC=afl-clang-fast ./config enable-fuzz-afl no-shared
+    $ make
+
+Run one of the fuzzers:
+
+    $ afl-fuzz fuzz/<fuzzer> -i fuzz/corpora/<fuzzer> -o fuzz/corpora/<fuzzer>/out <fuzzer> <arguments>
+
+Where `<fuzzer>` is one of the executables in `fuzz/`. Most fuzzers do not
+need any command line arguments, but, for example, `asn1` needs the name of a
+data type.

diff --git a/fuzz/asn1.c b/fuzz/asn1.c
index fdf4c5ee2986ce94fbfad5ffc5a6cfdd2242b708..66825f1b2cb120343d47ad937bbed432bb7071f0 100644 (file)
--- a/fuzz/asn1.c
+++ b/fuzz/asn1.c
@@ -60,7 +60,7 @@ static const ASN1_ITEM *item_type[] = {
     NULL
 };
 
-int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
+int FuzzerTestOneInput(const uint8_t *buf, size_t len) {
     for (int n = 0; item_type[n] != NULL; ++n) {
         const uint8_t *b = buf;
         ASN1_VALUE *o = ASN1_item_d2i(NULL, &b, len, item_type[n]);

diff --git a/fuzz/asn1parse.c b/fuzz/asn1parse.c
index 63104fb7d09d41dd8caae5dbb5c1e4cc40aee07d..2fe420b140bebe2abbacc7dcbed6ed1eace6b5b4 100644 (file)
--- a/fuzz/asn1parse.c
+++ b/fuzz/asn1parse.c
@@ -18,7 +18,7 @@
 #include <openssl/x509v3.h>
 #include "fuzzer.h"
 
-int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
+int FuzzerTestOneInput(const uint8_t *buf, size_t len) {
     static BIO *bio_out;
 
     if (bio_out == NULL)

diff --git a/fuzz/bignum.c b/fuzz/bignum.c
index 28a439e7d72f2d4950300a01186dd9ee63442bcd..643e6e7c658259d0234825937ba70fceaa4173ad 100644 (file)
--- a/fuzz/bignum.c
+++ b/fuzz/bignum.c
@@ -17,7 +17,7 @@
 #include <openssl/bn.h>
 #include "fuzzer.h"
 
-int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
+int FuzzerTestOneInput(const uint8_t *buf, size_t len) {
     int success = 0;
     static BN_CTX *ctx;
     static BN_MONT_CTX *mont;

diff --git a/fuzz/bndiv.c b/fuzz/bndiv.c
index c897de99b552b35d441ac8aafcd2a673d89b9f97..521281109bbce1517ef6b61b579156463d2f7412 100644 (file)
--- a/fuzz/bndiv.c
+++ b/fuzz/bndiv.c
@@ -17,7 +17,7 @@
 #include <openssl/bn.h>
 #include "fuzzer.h"
 
-int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
+int FuzzerTestOneInput(const uint8_t *buf, size_t len) {
     int success = 0;
     static BN_CTX *ctx;
     static BIGNUM *b1;

diff --git a/fuzz/build.info b/fuzz/build.info
index 3569418c0d73fd8e89416dd773d228d828504821..762ddf83a5d08c65aff9200646047c66df5ad621 100644 (file)
--- a/fuzz/build.info
+++ b/fuzz/build.info
@@ -1,33 +1,42 @@
+{- use File::Spec::Functions;
+   our $ex_inc = $withargs{fuzzer_include} &&
+       (file_name_is_absolute($withargs{fuzzer_include}) ?
+        $withargs{fuzzer_include} : catdir(updir(), $withargs{fuzzer_include}));
+   our $ex_lib = $withargs{fuzzer_lib} &&
+       (file_name_is_absolute($withargs{fuzzer_lib}) ?
+        $withargs{fuzzer_lib} : catfile(updir(), $withargs{fuzzer_lib}));
+   ""
+-}
 PROGRAMS=asn1 asn1parse bignum bndiv cms conf ct server
 
-SOURCE[asn1]=asn1.c
-INCLUDE[asn1]=../include ../../../svn-work/Fuzzer
-DEPEND[asn1]=../libcrypto ../../../svn-work/Fuzzer/libFuzzer
+SOURCE[asn1]=asn1.c driver.c
+INCLUDE[asn1]=../include {- $ex_inc -}
+DEPEND[asn1]=../libcrypto {- $ex_lib -}
 
-SOURCE[asn1parse]=asn1parse.c
-INCLUDE[asn1parse]=../include ../../../svn-work/Fuzzer
-DEPEND[asn1parse]=../libcrypto ../../../svn-work/Fuzzer/libFuzzer
+SOURCE[asn1parse]=asn1parse.c driver.c
+INCLUDE[asn1parse]=../include {- $ex_inc -}
+DEPEND[asn1parse]=../libcrypto {- $ex_lib -}
 
-SOURCE[bignum]=bignum.c
-INCLUDE[bignum]=../include ../../../svn-work/Fuzzer
-DEPEND[bignum]=../libcrypto ../../../svn-work/Fuzzer/libFuzzer
+SOURCE[bignum]=bignum.c driver.c
+INCLUDE[bignum]=../include {- $ex_inc -}
+DEPEND[bignum]=../libcrypto {- $ex_lib -}
 
-SOURCE[bndiv]=bndiv.c
-INCLUDE[bndiv]=../include ../../../svn-work/Fuzzer
-DEPEND[bndiv]=../libcrypto ../../../svn-work/Fuzzer/libFuzzer
+SOURCE[bndiv]=bndiv.c driver.c
+INCLUDE[bndiv]=../include {- $ex_inc -}
+DEPEND[bndiv]=../libcrypto {- $ex_lib -}
 
-SOURCE[cms]=cms.c
-INCLUDE[cms]=../include ../../../svn-work/Fuzzer
-DEPEND[cms]=../libcrypto ../../../svn-work/Fuzzer/libFuzzer
+SOURCE[cms]=cms.c driver.c
+INCLUDE[cms]=../include {- $ex_inc -}
+DEPEND[cms]=../libcrypto {- $ex_lib -}
 
-SOURCE[conf]=conf.c
-INCLUDE[conf]=../include ../../../svn-work/Fuzzer
-DEPEND[conf]=../libcrypto ../../../svn-work/Fuzzer/libFuzzer
+SOURCE[conf]=conf.c driver.c
+INCLUDE[conf]=../include {- $ex_inc -}
+DEPEND[conf]=../libcrypto {- $ex_lib -}
 
-SOURCE[ct]=ct.c
-INCLUDE[ct]=../include ../../../svn-work/Fuzzer
-DEPEND[ct]=../libcrypto ../../../svn-work/Fuzzer/libFuzzer
+SOURCE[ct]=ct.c driver.c
+INCLUDE[ct]=../include {- $ex_inc -}
+DEPEND[ct]=../libcrypto {- $ex_lib -}
 
-SOURCE[server]=server.c
-INCLUDE[server]=../include ../../../svn-work/Fuzzer
-DEPEND[server]=../libcrypto ../libssl ../../../svn-work/Fuzzer/libFuzzer
+SOURCE[server]=server.c driver.c
+INCLUDE[server]=../include {- $ex_inc -}
+DEPEND[server]=../libcrypto ../libssl {- $ex_lib -}

diff --git a/fuzz/cms.c b/fuzz/cms.c
index 7b4fc3d319fcf1023c0e85752380c2637d96b8a7..71f691f61b78aa58cd065856b2cea2ed516c26c1 100644 (file)
--- a/fuzz/cms.c
+++ b/fuzz/cms.c
@@ -16,7 +16,7 @@
 #include <openssl/cms.h>
 #include "fuzzer.h"
 
-int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
+int FuzzerTestOneInput(const uint8_t *buf, size_t len) {
     BIO *in = BIO_new(BIO_s_mem());
     OPENSSL_assert((size_t)BIO_write(in, buf, len) == len);
     CMS_ContentInfo *i = d2i_CMS_bio(in, NULL);

diff --git a/fuzz/conf.c b/fuzz/conf.c
index 3e3f7f184b620b8f07ba61aabbd14f2626a26545..d10d6c7f33cb574bb62b9574f6adf84610dc1a98 100644 (file)
--- a/fuzz/conf.c
+++ b/fuzz/conf.c
@@ -15,7 +15,7 @@
 #include <openssl/conf.h>
 #include "fuzzer.h"
 
-int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
+int FuzzerTestOneInput(const uint8_t *buf, size_t len) {
     CONF *conf = NCONF_new(NULL);
     BIO *in = BIO_new(BIO_s_mem());
     long eline;

diff --git a/fuzz/ct.c b/fuzz/ct.c
index 7050461142e4ba6e3d06e78a114ee7b869898342..dbb7ab4872421fe44d97f5f5e2c026d3a05496c3 100644 (file)
--- a/fuzz/ct.c
+++ b/fuzz/ct.c
@@ -16,7 +16,7 @@
 #include <openssl/ct.h>
 #include "fuzzer.h"
 
-int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
+int FuzzerTestOneInput(const uint8_t *buf, size_t len) {
     const uint8_t **pp = &buf;
     STACK_OF(SCT) *scts = d2i_SCT_LIST(NULL, pp, len);
     SCT_LIST_free(scts);

diff --git a/fuzz/driver.c b/fuzz/driver.c
new file mode 100644 (file)
index 0000000..de51574
--- /dev/null
+++ b/fuzz/driver.c
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the OpenSSL licenses, (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * https://www.openssl.org/source/license.html
+ * or in the file LICENSE in the source distribution.
+ */
+#include <stdint.h>
+#include <unistd.h>
+#include <openssl/opensslconf.h>
+#include "fuzzer.h"
+
+#ifndef OPENSSL_NO_FUZZ_LIBFUZZER
+
+int LLVMFuzzerInitialize(int *argc, char ***argv)
+{
+    if (FuzzerInitialize)
+        return FuzzerInitialize(argc, argv);
+    return 0;
+}
+
+int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
+    return FuzzerTestOneInput(buf, len);
+}
+
+#elif !defined(OPENSSL_NO_FUZZ_AFL)
+
+#define BUF_SIZE 65536
+
+int main(int argc, char** argv)
+{
+    if (FuzzerInitialize)
+        FuzzerInitialize(&argc, &argv);
+
+    while (__AFL_LOOP(10000)) {
+        uint8_t *buf = malloc(BUF_SIZE);
+        size_t size = read(0, buf, BUF_SIZE);
+
+        FuzzerTestOneInput(buf, size);
+        free(buf);
+    }
+    return 0;
+}
+
+#else
+
+#error "Unsupported fuzzer"
+
+#endif

diff --git a/fuzz/fuzzer.h b/fuzz/fuzzer.h
index b3c3428c9b5f9871e931f4b70dde6f9db5bd09bb..289aee2f6067d78e6def619a5bd7b3bd009667f6 100644 (file)
--- a/fuzz/fuzzer.h
+++ b/fuzz/fuzzer.h
@@ -8,5 +8,5 @@
  * or in the file LICENSE in the source distribution.
  */
 
-int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len);
-int LLVMFuzzerInitialize(int *argc, char ***argv);
+int FuzzerTestOneInput(const uint8_t *buf, size_t len);
+__attribute__((weak)) int FuzzerInitialize(int *argc, char ***argv);

diff --git a/fuzz/server.c b/fuzz/server.c
index d3ed1adfe0be519a9666ca4b6d4d387bfbc9f50a..7b376c1abbe5f082ff67760817a1d08f58c84ea0 100644 (file)
--- a/fuzz/server.c
+++ b/fuzz/server.c
@@ -208,7 +208,7 @@ static void Init() {
     X509_free(cert);
   }
 
-int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
+int FuzzerTestOneInput(const uint8_t *buf, size_t len) {
     if (ctx == NULL)
         Init();
     // TODO: make this work for OpenSSL. There's a PREDICT define that may do