about summary refs log tree commit diff
path: root/include
diff options
context:
space:
mode:
authorvan Hauser <vh@thc.org>2021-03-19 23:54:36 +0100
committerGitHub <noreply@github.com>2021-03-19 23:54:36 +0100
commit090128b3f8b8bc80cf47ae1481b01c0509dc6357 (patch)
tree03c3314427f02533a8db3e06587ce3afe74a5f23 /include
parentd7e121e2c99c02d4b6984f21ba837d44bce9c77c (diff)
parent749b03d812b76746b4a673f34a13fb0b067fd61d (diff)
downloadafl++-090128b3f8b8bc80cf47ae1481b01c0509dc6357.tar.gz
Merge branch 'dev' into dev
Diffstat (limited to 'include')
-rw-r--r--include/common.h4
-rw-r--r--include/config.h9
-rw-r--r--include/envs.h1
3 files changed, 14 insertions, 0 deletions
diff --git a/include/common.h b/include/common.h
index 06453b8e..05137fb6 100644
--- a/include/common.h
+++ b/include/common.h
@@ -61,6 +61,10 @@ extern u8 *doc_path;                    /* path to documentation dir        */
 
 u8 *find_binary(u8 *fname);
 
+/* find an afl binary */
+
+u8 *find_afl_binary(u8 *own_loc, u8 *fname);
+
 /* Parses the kill signal environment variable, FATALs on error.
   If the env is not set, sets the env to default_signal for the signal handlers
   and returns the default_signal. */
diff --git a/include/config.h b/include/config.h
index b049fee0..29225f6b 100644
--- a/include/config.h
+++ b/include/config.h
@@ -34,6 +34,15 @@
  *                                                    *
  ******************************************************/
 
+/* Default shared memory map size. Most targets just need a coverage map
+   between 20-250kb. Plus there is an auto-detection feature in afl-fuzz.
+   However if a target has problematic constructors and init arrays then
+   this can fail. Hence afl-fuzz deploys a larger default map. The largest
+   map seen so far is the xlsx fuzzer for libreoffice which is 5MB.
+   At runtime this value can be overriden via AFL_MAP_SIZE.
+   Default: 8MB (defined in bytes) */
+#define DEFAULT_SHMEM_SIZE (8 * 1024 * 1024)
+
 /* CMPLOG/REDQUEEN TUNING
  *
  * Here you can modify tuning and solving options for CMPLOG.
diff --git a/include/envs.h b/include/envs.h
index fda4ab55..d7578045 100644
--- a/include/envs.h
+++ b/include/envs.h
@@ -42,6 +42,7 @@ static char *afl_environment_variables[] = {
     "AFL_DEBUG_CHILD",
     "AFL_DEBUG_GDB",
     "AFL_DISABLE_TRIM",
+    "AFL_DISABLE_LLVM_INSTRUMENTATION",
     "AFL_DONT_OPTIMIZE",
     "AFL_DRIVER_STDERR_DUPLICATE_FILENAME",
     "AFL_DUMB_FORKSRV",