diff --git a/GNUmakefile b/GNUmakefile
index 527cdcfc6b961e05b5c0d025cce6e371659b16d6..68ca17d0bbc42f8b7d1219fd97bedb54e6fd711a 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -567,21 +567,23 @@ clean:
rm -rf $(PROGS) afl-fuzz-document afl-as as afl-g++ afl-clang afl-clang++ *.o src/*.o *~ a.out core core.[1-9][0-9]* *.stackdump .test .test1 .test2 test-instr .test-instr0 .test-instr1 afl-cs-proxy afl-qemu-trace afl-gcc-fast afl-g++-fast ld *.so *.8 test/unittests/*.o test/unittests/unit_maybe_alloc test/unittests/preallocable .afl-* afl-gcc afl-g++ afl-clang afl-clang++ test/unittests/unit_hash test/unittests/unit_rand *.dSYM
-$(MAKE) -f GNUmakefile.llvm clean
-$(MAKE) -f GNUmakefile.gcc_plugin clean
- $(MAKE) -C utils/libdislocator clean
- $(MAKE) -C utils/libtokencap clean
+ -$(MAKE) -C utils/libdislocator clean
+ -$(MAKE) -C utils/libtokencap clean
$(MAKE) -C utils/aflpp_driver clean
- $(MAKE) -C utils/afl_network_proxy clean
- $(MAKE) -C utils/socket_fuzzing clean
- $(MAKE) -C utils/argv_fuzzing clean
+ -$(MAKE) -C utils/afl_network_proxy clean
+ -$(MAKE) -C utils/socket_fuzzing clean
+ -$(MAKE) -C utils/argv_fuzzing clean
-$(MAKE) -C utils/plot_ui clean
- $(MAKE) -C qemu_mode/unsigaction clean
- $(MAKE) -C qemu_mode/libcompcov clean
- $(MAKE) -C qemu_mode/libqasan clean
+ -$(MAKE) -C qemu_mode/unsigaction clean
+ -$(MAKE) -C qemu_mode/libcompcov clean
+ -$(MAKE) -C qemu_mode/libqasan clean
-$(MAKE) -C frida_mode clean
+ rm -rf nyx_mode/packer/linux_initramfs/init.cpio.gz nyx_mode/libnyx/libnyx/target/release/* nyx_mode/QEMU-Nyx/x86_64-softmmu/qemu-system-x86_64
ifeq "$(IN_REPO)" "1"
-test -e coresight_mode/coresight-trace/Makefile && $(MAKE) -C coresight_mode/coresight-trace clean || true
-test -e qemu_mode/qemuafl/Makefile && $(MAKE) -C qemu_mode/qemuafl clean || true
- test -e unicorn_mode/unicornafl/Makefile && $(MAKE) -C unicorn_mode/unicornafl clean || true
+ -test -e unicorn_mode/unicornafl/Makefile && $(MAKE) -C unicorn_mode/unicornafl clean || true
+ -test -e nyx_mode/QEMU-Nyx/Makefile && $(MAKE) -C nyx_mode/QEMU-Nyx clean || true
else
rm -rf coresight_mode/coresight_trace
rm -rf qemu_mode/qemuafl
@@ -593,11 +595,14 @@ deepclean: clean
rm -rf coresight_mode/coresight-trace
rm -rf unicorn_mode/unicornafl
rm -rf qemu_mode/qemuafl
+ rm -rf nyx_mode/libnyx nyx_mode/packer nyx_mode/QEMU-Nyx
ifeq "$(IN_REPO)" "1"
-# NEVER EVER ACTIVATE THAT!!!!! git reset --hard >/dev/null 2>&1 || true
git checkout coresight_mode/coresight-trace
git checkout unicorn_mode/unicornafl
git checkout qemu_mode/qemuafl
+ git checkout nyx_mode/libnyx
+ git checkout nyx_mode/packer
+ git checkout nyx_mode/QEMU-Nyx
endif
.PHONY: distrib
@@ -606,11 +611,11 @@ distrib: all
ifneq "$(SYS)" "Darwin"
-$(MAKE) -f GNUmakefile.gcc_plugin
endif
- $(MAKE) -C utils/libdislocator
- $(MAKE) -C utils/libtokencap
- $(MAKE) -C utils/afl_network_proxy
- $(MAKE) -C utils/socket_fuzzing
- $(MAKE) -C utils/argv_fuzzing
+ -$(MAKE) -C utils/libdislocator
+ -$(MAKE) -C utils/libtokencap
+ -$(MAKE) -C utils/afl_network_proxy
+ -$(MAKE) -C utils/socket_fuzzing
+ -$(MAKE) -C utils/argv_fuzzing
# -$(MAKE) -C utils/plot_ui
-$(MAKE) -C frida_mode
ifneq "$(SYS)" "Darwin"
@@ -626,11 +631,11 @@ endif
.PHONY: binary-only
binary-only: test_shm test_python ready $(PROGS)
- $(MAKE) -C utils/libdislocator
- $(MAKE) -C utils/libtokencap
- $(MAKE) -C utils/afl_network_proxy
- $(MAKE) -C utils/socket_fuzzing
- $(MAKE) -C utils/argv_fuzzing
+ -$(MAKE) -C utils/libdislocator
+ -$(MAKE) -C utils/libtokencap
+ -$(MAKE) -C utils/afl_network_proxy
+ -$(MAKE) -C utils/socket_fuzzing
+ -$(MAKE) -C utils/argv_fuzzing
# -$(MAKE) -C utils/plot_ui
-$(MAKE) -C frida_mode
ifneq "$(SYS)" "Darwin"
@@ -650,8 +655,8 @@ source-only: all
ifneq "$(SYS)" "Darwin"
-$(MAKE) -f GNUmakefile.gcc_plugin
endif
- $(MAKE) -C utils/libdislocator
- $(MAKE) -C utils/libtokencap
+ -$(MAKE) -C utils/libdislocator
+ -$(MAKE) -C utils/libtokencap
# -$(MAKE) -C utils/plot_ui
ifeq "$(SYS)" "Linux"
-cd nyx_mode && ./build_nyx_support.sh
diff --git a/README.md b/README.md
index 5c2262cfb81148daa83d05f8d3bce1108ec4fb50..049518f82f503a158c8bbfa2b1dd35ab28d82c6e 100644
--- a/README.md
+++ b/README.md
@@ -1,20 +1,20 @@
# American Fuzzy Lop plus plus (AFL++)
-<img align="right" src="https://raw.githubusercontent.com/andreafioraldi/AFLplusplus-website/master/static/logo_256x256.png" alt="AFL++ logo">
+<img align="right" src="https://raw.githubusercontent.com/AFLplusplus/Website/master/static/aflpp_bg.svg" alt="AFL++ logo" width="250" heigh="250">
-Release version: [3.14c](https://github.com/AFLplusplus/AFLplusplus/releases)
+Release version: [4.00c](https://github.com/AFLplusplus/AFLplusplus/releases)
-GitHub version: 3.15a
+GitHub version: 4.00c
Repository:
[https://github.com/AFLplusplus/AFLplusplus](https://github.com/AFLplusplus/AFLplusplus)
AFL++ is maintained by:
-* Marc "van Hauser" Heuse <mh@mh-sec.de>,
-* Heiko "hexcoder-" Eißfeldt <heiko.eissfeldt@hexco.de>,
-* Andrea Fioraldi <andreafioraldi@gmail.com> and
-* Dominik Maier <mail@dmnk.co>.
+* Marc "van Hauser" Heuse <mh@mh-sec.de>
+* Heiko "hexcoder-" Eißfeldt <heiko.eissfeldt@hexco.de>
+* Andrea Fioraldi <andreafioraldi@gmail.com>
+* Dominik Maier <mail@dmnk.co>
* Documentation: Jana Aydinbas <jana.aydinbas@gmail.com>
Originally developed by Michał "lcamtuf" Zalewski.
@@ -29,13 +29,13 @@ terms of the Apache-2.0 License. See the [LICENSE](LICENSE) for details.
Here is some information to get you started:
-* For an overview of the AFL++ documentation and a very helpful graphical
- guide please visit [docs/README.md](docs/README.md)
+* For an overview of the AFL++ documentation and a very helpful graphical guide,
+ please visit [docs/README.md](docs/README.md).
* To get you started with tutorials, go to
[docs/tutorials.md](docs/tutorials.md).
* For releases, see the
[Releases tab](https://github.com/AFLplusplus/AFLplusplus/releases) and
- [branches](#branches). The best branches to use are however `stable` or
+ [branches](#branches). The best branches to use are, however, `stable` or
`dev` - depending on your risk appetite. Also take a look at the list of
[important changes in AFL++](docs/important_changes.md) and the list of
[features](docs/features.md).
@@ -127,13 +127,13 @@ Step-by-step quick start:
Questions? Concerns? Bug reports?
-* The contributors can be reached via (e.g. by creating an issue):
+* The contributors can be reached via (e.g., by creating an issue):
[https://github.com/AFLplusplus/AFLplusplus](https://github.com/AFLplusplus/AFLplusplus).
* Take a look at our [FAQ](docs/FAQ.md). If you find an interesting or important
question missing, submit it via
[https://github.com/AFLplusplus/AFLplusplus/discussions](https://github.com/AFLplusplus/AFLplusplus/discussions).
* Best: join the [Awesome Fuzzing](https://discord.gg/gCraWct) Discord server.
-* There is a (not really used) mailing list for the AFL/AFL++ project
+* There is a (not really used) mailing list for the AFL/AFL++ project
([browse archive](https://groups.google.com/group/afl-users)). To compare
notes with other users or to get notified about major new features, send an
email to <afl-users+subscribe@googlegroups.com>, but note that this is not
diff --git a/coresight_mode/coresight-trace b/coresight_mode/coresight-trace
index ec0fd6104720ac0b59967616363dc18209adc02e..fe8b26ea4b07fafa6f24e77c84dad0f3925d47d8 160000
--- a/coresight_mode/coresight-trace
+++ b/coresight_mode/coresight-trace
@@ -1 +1 @@
-Subproject commit ec0fd6104720ac0b59967616363dc18209adc02e
+Subproject commit fe8b26ea4b07fafa6f24e77c84dad0f3925d47d8
diff --git a/custom_mutators/grammar_mutator/GRAMMAR_VERSION b/custom_mutators/grammar_mutator/GRAMMAR_VERSION
index 4743e7c20618488617d813498d91974f193f1e75..93f9321c1c139938eda05221d673b4641d8447ae 100644
--- a/custom_mutators/grammar_mutator/GRAMMAR_VERSION
+++ b/custom_mutators/grammar_mutator/GRAMMAR_VERSION
@@ -1 +1 @@
-6ca490c
+cbe5e32
diff --git a/custom_mutators/grammar_mutator/grammar_mutator b/custom_mutators/grammar_mutator/grammar_mutator
index 6ca490c66b949db20d8c861ebc8fb2e6ca725ead..cbe5e32752773945e0142fac9f1b7a0ccb5dcdff 160000
--- a/custom_mutators/grammar_mutator/grammar_mutator
+++ b/custom_mutators/grammar_mutator/grammar_mutator
@@ -1 +1 @@
-Subproject commit 6ca490c66b949db20d8c861ebc8fb2e6ca725ead
+Subproject commit cbe5e32752773945e0142fac9f1b7a0ccb5dcdff
diff --git a/docs/Changelog.md b/docs/Changelog.md
index bdd6c405b0175163ca03b6587735793ad91cfd8c..7f5395569650b4c64b2e6c1efef4059a6c49f0f9 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -1,15 +1,16 @@
# Changelog
- This is the list of all noteworthy changes made in every public release of
- the tool. See README.md for the general instruction manual.
+ This is the list of all noteworthy changes made in every public
+ release of the tool. See README.md for the general instruction manual.
## Staying informed
Want to stay in the loop on major new features? Join our mailing list by
sending a mail to <afl-users+subscribe@googlegroups.com>.
-### Version ++3.15a (dev)
- - documentation restructuring, made possible by Google Season of Docs
+### Version ++4.00c (release)
+ - complete documentation restructuring, made possible by Google Season
+ of Docs :) thank you Jana!
- we renamed several UI and fuzzer_stat entries to be more precise,
e.g. "unique crashes" -> "saved crashes", "total paths" ->
"corpus count", "current path" -> "current item".
@@ -17,14 +18,14 @@ sending a mail to <afl-users+subscribe@googlegroups.com>.
- Nyx mode (full system emulation with snapshot capability) has been
added - thanks to @schumilo and @eqv!
- unicorn_mode:
- - Moved to unicorn2! By Ziqiao Kong (@lazymio)
- - Faster, more accurate emulation (newer QEMU base), riscv support
+ - Moved to unicorn2! by Ziqiao Kong (@lazymio)
+ - Faster, more accurate emulation (newer QEMU base), risc-v support
- removed indirections in rust callbacks
- new binary-only fuzzing mode: coresight_mode for aarch64 CPUs :)
thanks to RICSecLab submitting!
- if instrumented libaries are dlopen()'ed after the forkserver you
- will now see crashes. before you would have colliding coverage.
- we changed this to force fixing a broken setup rather then allowing
+ will now see a crash. Before you would have colliding coverage.
+ We changed this to force fixing a broken setup rather then allowing
ineffective fuzzing.
See docs/best_practices.md how to fix such setups.
- afl-fuzz:
@@ -32,10 +33,11 @@ sending a mail to <afl-users+subscribe@googlegroups.com>.
(it is better!)
- fix a regression introduced in 3.10 that resulted in less
coverage being detected. thanks to Collin May for reporting!
+ - ensure all spawned targets are killed on exit
- added AFL_IGNORE_PROBLEMS, plus checks to identify and abort on
incorrect LTO usage setups and enhanced the READMEs for better
information on how to deal with instrumenting libraries
- - fix -n dumb mode (nobody should use this)
+ - fix -n dumb mode (nobody should use this mode though)
- fix stability issue with LTO and cmplog
- better banner
- more effective cmplog mode
@@ -54,6 +56,7 @@ sending a mail to <afl-users+subscribe@googlegroups.com>.
- Prevent accidentaly killing non-afl/fuzz services when aborting
afl-showmap and other tools.
- afl-cc:
+ - detect overflow reads on initial input buffer for asan
- new cmplog mode (incompatible with older afl++ versions)
- support llvm IR select instrumentation for default PCGUARD and LTO
- fix for shared linking on MacOS
@@ -62,7 +65,7 @@ sending a mail to <afl-users+subscribe@googlegroups.com>.
- fixed a potential crash in targets for LAF string handling
- fixed a bad assert in LAF split switches
- added AFL_USE_TSAN thread sanitizer support
- - llvm and LTO mode modified to work with new llvm 14-dev (again. again.)
+ - llvm and LTO mode modified to work with new llvm 14-dev (again.)
- fix for AFL_REAL_LD
- more -z defs filtering
- make -v without options work
@@ -73,7 +76,7 @@ sending a mail to <afl-users+subscribe@googlegroups.com>.
- added afl-persistent-config script to set perform permanent system
configuration settings for fuzzing, for Linux and Macos.
thanks to jhertz!
- - added xml, curl and exotic string functions to llvm dictionary features
+ - added xml, curl & exotic string functions to llvm dictionary feature
- fix AFL_PRELOAD issues on MacOS
- removed utils/afl_frida because frida_mode/ is now so much better
- added uninstall target to makefile (todo: update new readme!)
@@ -96,7 +99,7 @@ sending a mail to <afl-users+subscribe@googlegroups.com>.
- Fix to instrument global namespace functions in c++
- Fix for llvm 13
- support partial linking
- - do honor AFL_LLVM_{ALLOW/DENY}LIST for LTO autodictionary and DICT2FILE
+ - do honor AFL_LLVM_{ALLOW/DENY}LIST for LTO autodictionary andDICT2FILE
- We do support llvm versions from 3.8 to 5.0 again
- frida_mode:
- several fixes for cmplog
diff --git a/docs/FAQ.md b/docs/FAQ.md
index 73328d6eca64e73cda762e9e4667f9375a7a57e1..1822e46b4237f17ba16fc09c7f689bd8f79e7e8b 100644
--- a/docs/FAQ.md
+++ b/docs/FAQ.md
@@ -188,8 +188,9 @@ If you find an interesting or important question missing, submit it via
A power schedule measures how "interesting" a value is, and depending on
the calculated value spends more or less time mutating it.
- AFL++ comes with several power schedules, initially ported from [AFLFast](https://github.com/mboehme/aflfast)
- however modified to be more effective and several more modes added.
+ AFL++ comes with several power schedules, initially ported from
+ [AFLFast](https://github.com/mboehme/aflfast), however, modified to be more
+ effective and several more modes added.
The most effective modes are `-p fast` (default) and `-p explore`.
@@ -200,6 +201,7 @@ If you find an interesting or important question missing, submit it via
It does not make sense to explain the details of the calculation and
reasoning behind all of the schedules. If you are interested, read the source
code and the AFLFast paper.
+</p></details>
## Troubleshooting
@@ -215,16 +217,18 @@ If you find an interesting or important question missing, submit it via
To ignore this set AFL_IGNORE_PROBLEMS=1.
```
- As the error describes, a dlopen() call is happening in the target that is loading an instrumented library after the forkserver is already in place,
- This is a problem for afl-fuzz because when the forkserver is started we must know the map size already and it can't be changed later.
+ As the error describes, a dlopen() call is happening in the target that is
+ loading an instrumented library after the forkserver is already in place. This
+ is a problem for afl-fuzz because when the forkserver is started, we must know
+ the map size already and it can't be changed later.
- The best solution is to simply set `AFL_PRELOAD=foo.so` the libraries that
- are dlopen'ed (e.g. use `strace` to see which), or to set a manual forkserver
+ The best solution is to simply set `AFL_PRELOAD=foo.so` to the libraries that
+ are dlopen'ed (e.g., use `strace` to see which), or to set a manual forkserver
after the final dlopen().
- If this is not a viable option you can set `AFL_IGNORE_PROBLEMS=1` but then
+ If this is not a viable option, you can set `AFL_IGNORE_PROBLEMS=1` but then
the existing map will be used also for the newly loaded libraries, which
- allows it to work, however the efficiency of the fuzzing will be partially
+ allows it to work, however, the efficiency of the fuzzing will be partially
degraded.
</p></details>
diff --git a/docs/INSTALL.md b/docs/INSTALL.md
index 3c96a4fd04cdd9b1e6349ae18327dd57ae4a5425..2847ca2ac4ad7c2fd9fd94ffd9c3d7900df6a43c 100644
--- a/docs/INSTALL.md
+++ b/docs/INSTALL.md
@@ -33,10 +33,10 @@ sudo make install
It is recommended to install the newest available gcc, clang and llvm-dev
possible in your distribution!
-Note that `make distrib` also builds FRIDA mode, QEMU mode, unicorn_mode
-and more. If you just want plain AFL++, then do `make all`. If you want
-some assisting tooling compiled but are not interested in binary-only targets
-then instead choose:
+Note that `make distrib` also builds FRIDA mode, QEMU mode, unicorn_mode, and
+more. If you just want plain AFL++, then do `make all`. If you want some
+assisting tooling compiled but are not interested in binary-only targets, then
+instead choose:
```shell
make source-only
@@ -46,7 +46,8 @@ These build targets exist:
* all: the main afl++ binaries and llvm/gcc instrumentation
* binary-only: everything for binary-only fuzzing: frida_mode, nyx_mode,
- qemu_mode, frida_mode, unicorn_mode, coresight_mode, libdislocator, libtokencap
+ qemu_mode, frida_mode, unicorn_mode, coresight_mode, libdislocator,
+ libtokencap
* source-only: everything for source code fuzzing: nyx_mode, libdislocator,
libtokencap
* distrib: everything (for both binary-only and source code fuzzing)
@@ -116,10 +117,9 @@ sudo gmake install
```
`afl-gcc` will fail unless you have GCC installed, but that is using outdated
-instrumentation anyway. `afl-clang` might fail too depending on your PATH
-setup. But you don't want neither, you want `afl-clang-fast` anyway :)
-Note that `afl-clang-lto`, `afl-gcc-fast` and `qemu_mode` are not working on
-MacOS.
+instrumentation anyway. `afl-clang` might fail too depending on your PATH setup.
+But you don't want neither, you want `afl-clang-fast` anyway :) Note that
+`afl-clang-lto`, `afl-gcc-fast` and `qemu_mode` are not working on MacOS.
The crash reporting daemon that comes by default with MacOS X will cause
problems with fuzzing. You need to turn it off:
diff --git a/docs/env_variables.md b/docs/env_variables.md
index 76a64bd2e423f002f213f179f9ac68941be31c40..2a8fbcb77249d98b11abaaad17b3db81a6b1d6c7 100644
--- a/docs/env_variables.md
+++ b/docs/env_variables.md
@@ -285,12 +285,12 @@ mode.
```
- GCC_PLUGIN mode only: Setting `AFL_GCC_INSTRUMENT_FILE` or
- `AFL_GCC_ALLOWLIST` with a filename will only instrument those files
- that match the names listed in this file (one filename per line).
-
- Setting `AFL_GCC_DENYLIST` or `AFL_GCC_BLOCKLIST`
- with a file name and/or function will only skip those files that match
- the names listed in the specified file. See
+ `AFL_GCC_ALLOWLIST` with a filename will only instrument those files that
+ match the names listed in this file (one filename per line).
+
+ Setting `AFL_GCC_DENYLIST` or `AFL_GCC_BLOCKLIST` with a file name and/or
+ function will only skip those files that match the names listed in the
+ specified file. See
[instrumentation/README.instrument_list.md](../instrumentation/README.instrument_list.md)
for more information.
@@ -298,8 +298,8 @@ mode.
code with calls to an injected subroutine instead of the much more efficient
inline instrumentation.
- Setting `AFL_GCC_SKIP_NEVERZERO=1` will not implement the skip zero test.
- If the target performs only a few loops, then this will give a small
+ Setting `AFL_GCC_SKIP_NEVERZERO=1` will not implement the skip zero test. If
+ the target performs only a few loops, then this will give a small
performance boost.
## 4) Settings for afl-fuzz
diff --git a/docs/features.md b/docs/features.md
index 628f93837a44df29f1bc69a25521e42f2580c7d1..dd3d2bcb7b22c8ac4c0cd3b095352671a03d8d8a 100644
--- a/docs/features.md
+++ b/docs/features.md
@@ -1,70 +1,88 @@
# Important features of AFL++
AFL++ supports llvm from 3.8 up to version 12, very fast binary fuzzing with
-QEMU 5.1 with laf-intel and redqueen, FRIDA mode, unicorn mode, gcc plugin, full
+QEMU 5.1 with laf-intel and Redqueen, FRIDA mode, unicorn mode, gcc plugin, full
*BSD, Mac OS, Solaris and Android support and much, much, much more.
-| Feature/Instrumentation | afl-gcc | llvm | gcc_plugin | FRIDA mode(9) | QEMU mode(10) |unicorn_mode(10) |nyx_mode(12)|coresight_mode(11)|
-| ------------------------------|:-------:|:---------:|:----------:|:----------------:|:----------------:|:----------------:|:----------:|:----------------:|
-| Threadsafe counters [A] | | x(3) | | | | | x | |
-| NeverZero [B] | x86[_64]| x(1) | x | x | x | x | | |
-| Persistent Mode [C] | | x | x | x86[_64]/arm64 | x86[_64]/arm[64] | x | | |
-| LAF-Intel / CompCov [D] | | x | | | x86[_64]/arm[64] | x86[_64]/arm[64] | x86[_64] | |
-| CmpLog [E] | | x | | x86[_64]/arm64 | x86[_64]/arm[64] | | | |
-| Selective Instrumentation [F] | | x | x | x | x | | | |
-| Non-Colliding Coverage [G] | | x(4) | | | (x)(5) | | | |
-| Ngram prev_loc Coverage [H] | | x(6) | | | | | | |
-| Context Coverage [I] | | x(6) | | | | | | |
-| Auto Dictionary [J] | | x(7) | | | | | | |
-| Snapshot Support (K) | | (x)(8) | (x)(8) | | (x)(5) | | x | |
-| Shared Memory Test cases [L] | | x | x | x86[_64]/arm64 | x | x | x | |
+## Features and instrumentation
+
+| Feature/Instrumentation | afl-gcc | llvm | gcc_plugin | FRIDA mode(9) | QEMU mode(10) | unicorn_mode(10) | nyx_mode(12) | coresight_mode(11) |
+| ------------------------------|:--------:|:---------:|:----------:|:--------------:|:----------------:|:----------------:|:------------:|:------------------:|
+| Threadsafe counters [A] | | x(3) | | | | | x | |
+| NeverZero [B] | x86[_64] | x(1) | x | x | x | x | | |
+| Persistent Mode [C] | | x | x | x86[_64]/arm64 | x86[_64]/arm[64] | x | | |
+| LAF-Intel / CompCov [D] | | x | | | x86[_64]/arm[64] | x86[_64]/arm[64] | x86[_64] | |
+| CmpLog [E] | | x | | x86[_64]/arm64 | x86[_64]/arm[64] | | | |
+| Selective Instrumentation [F] | | x | x | x | x | | | |
+| Non-Colliding Coverage [G] | | x(4) | | | (x)(5) | | | |
+| Ngram prev_loc Coverage [H] | | x(6) | | | | | | |
+| Context Coverage [I] | | x(6) | | | | | | |
+| Auto Dictionary [J] | | x(7) | | | | | | |
+| Snapshot Support [K] | | (x)(8) | (x)(8) | | (x)(5) | | x | |
+| Shared Memory Test cases [L] | | x | x | x86[_64]/arm64 | x | x | x | |
+
+## More information about features
A. Default is not thread-safe coverage counter updates for better performance,
see [instrumentation/README.llvm.md](../instrumentation/README.llvm.md)
-B. On wrapping coverage counters (255 + 1) skip the 0 value and jump to 1
- instead. This has shown to give better coverage data and is the default;
- see [instrumentation/README.llvm.md](../instrumentation/README.llvm.md)
+
+B. On wrapping coverage counters (255 + 1), skip the 0 value and jump to 1
+ instead. This has shown to give better coverage data and is the default; see
+ [instrumentation/README.llvm.md](../instrumentation/README.llvm.md).
+
C. Instead of forking, reiterate the fuzz target function in a loop (like
- `LLVMFuzzerTestOneInput`. Great speed increase but only work with target
- functions that does not keep state, leak memory or exit;
- see [instrumentation/README.persistent_mode.md](../instrumentation/README.persistent_mode.md)
-D. Split any non-8-bit comparison to 8 bit comparison;
- see [instrumentation/README.laf-intel.md](../instrumentation/README.laf-intel.md)
-E. CmpLog is our enhanced [Redqueen](https://www.ndss-symposium.org/ndss-paper/redqueen-fuzzing-with-input-to-state-correspondence/)
- implementation, see see [instrumentation/README.cmplog.md](../instrumentation/README.cmplog.md)
+ `LLVMFuzzerTestOneInput`. Great speed increase but only works with target
+ functions that do not keep state, leak memory, or exit; see
+ [instrumentation/README.persistent_mode.md](../instrumentation/README.persistent_mode.md)
+
+D. Split any non-8-bit comparison to 8-bit comparison; see
+ [instrumentation/README.laf-intel.md](../instrumentation/README.laf-intel.md)
+
+E. CmpLog is our enhanced
+ [Redqueen](https://www.ndss-symposium.org/ndss-paper/redqueen-fuzzing-with-input-to-state-correspondence/)
+ implementation, see
+ [instrumentation/README.cmplog.md](../instrumentation/README.cmplog.md)
+
F. Similar and compatible to clang 13+ sancov sanitize-coverage-allow/deny but
for all llvm versions and all our compile modes, only instrument what should
- be instrumented, for more speed, directed fuzzing and less instability;
- see [instrumentation/README.instrument_list.md](../instrumentation/README.instrument_list.md)
+ be instrumented, for more speed, directed fuzzing and less instability; see
+ [instrumentation/README.instrument_list.md](../instrumentation/README.instrument_list.md)
+
G. Vanilla AFL uses coverage where edges could collide to the same coverage
bytes the larger the target is. Our default instrumentation in LTO and
afl-clang-fast (PCGUARD) uses non-colliding coverage that also makes it
- faster. Vanilla AFL style is available with `AFL_LLVM_INSTRUMENT=AFL`;
- see [instrumentation/README.llvm.md](../instrumentation/README.llvm.md)
+ faster. Vanilla AFL style is available with `AFL_LLVM_INSTRUMENT=AFL`; see
+ [instrumentation/README.llvm.md](../instrumentation/README.llvm.md).
+
H.+I. Alternative coverage based on previous edges (NGRAM) or depending on the
- caller (CTX), based on
+ caller (CTX), based on
[https://www.usenix.org/system/files/raid2019-wang-jinghan.pdf](https://www.usenix.org/system/files/raid2019-wang-jinghan.pdf);
- see [instrumentation/README.llvm.md](../instrumentation/README.llvm.md)
+ see [instrumentation/README.llvm.md](../instrumentation/README.llvm.md).
+
J. An LTO feature that creates a fuzzing dictionary based on comparisons found
- during compilation/instrumentation. Automatic feature :)
- See [instrumentation/README.lto.md](../instrumentation/README.lto.md)
+ during compilation/instrumentation. Automatic feature :) See
+ [instrumentation/README.lto.md](../instrumentation/README.lto.md)
+
K. The snapshot feature requires a kernel module that was a lot of work to get
right and maintained so it is no longer supported. We have
[nyx_mode](../nyx_mode/README.md) instead.
+
L. Faster fuzzing and less kernel syscall overhead by in-memory fuzz testcase
delivery, see
[instrumentation/README.persistent_mode.md](../instrumentation/README.persistent_mode.md)
-1. default for LLVM >= 9.0, environment variable for older version due an
+## More information about instrumentation
+
+1. Default for LLVM >= 9.0, environment variable for older version due an
efficiency bug in previous llvm versions
2. GCC creates non-performant code, hence it is disabled in gcc_plugin
-3. with `AFL_LLVM_THREADSAFE_INST`, disables NeverZero
-4. with pcguard mode and LTO mode for LLVM 11 and newer
-5. upcoming, development in the branch
-6. not compatible with LTO instrumentation and needs at least LLVM v4.1
-7. automatic in LTO mode with LLVM 11 and newer, an extra pass for all LLVM
+3. With `AFL_LLVM_THREADSAFE_INST`, disables NeverZero
+4. With pcguard mode and LTO mode for LLVM 11 and newer
+5. Upcoming, development in the branch
+6. Not compatible with LTO instrumentation and needs at least LLVM v4.1
+7. Automatic in LTO mode with LLVM 11 and newer, an extra pass for all LLVM
versions that write to a file to use with afl-fuzz' `-x`
-8. the snapshot LKM is currently unmaintained due to too many kernel changes
+8. The snapshot LKM is currently unmaintained due to too many kernel changes
coming too fast :-(
9. FRIDA mode is supported on Linux and MacOS for Intel and ARM
10. QEMU/Unicorn is only supported on Linux
@@ -72,6 +90,8 @@ L. Faster fuzzing and less kernel syscall overhead by in-memory fuzz testcase
extension
12. Nyx mode is only supported on Linux and currently restricted to x86_x64
+## Integrated features and patches
+
Among others, the following features and patches have been integrated:
* NeverZero patch for afl-gcc, instrumentation, QEMU mode and unicorn_mode which
@@ -80,7 +100,7 @@ Among others, the following features and patches have been integrated:
* Unicorn mode which allows fuzzing of binaries from completely different
platforms (integration provided by domenukk)
* The new CmpLog instrumentation for LLVM and QEMU inspired by
- [Redqueen](https://www.syssec.ruhr-uni-bochum.de/media/emma/veroeffentlichungen/2018/12/17/NDSS19-Redqueen.pdf)
+ [Redqueen](https://github.com/RUB-SysSec/redqueen)
* Win32 PE binary-only fuzzing with QEMU and Wine
* AFLfast's power schedules by Marcel Böhme:
[https://github.com/mboehme/aflfast](https://github.com/mboehme/aflfast)
diff --git a/docs/fuzzing_binary-only_targets.md b/docs/fuzzing_binary-only_targets.md
index 32e6c6c2fd28c7e781e48c0456155f53221a51fc..1a2b27c72784062240f2e7b542a9c63d7c9883a3 100644
--- a/docs/fuzzing_binary-only_targets.md
+++ b/docs/fuzzing_binary-only_targets.md
@@ -14,6 +14,7 @@ fuzzed with AFL++.
FRIDA mode and QEMU mode in persistent mode are the fastest - if persistent mode
is possible and the stability is high enough.
+
Otherwise, try Zafl, RetroWrite, Dyninst, and if these fail, too, then try
standard FRIDA/QEMU mode with `AFL_ENTRYPOINT` to where you need it.
@@ -127,13 +128,13 @@ Working examples already exist :-)
### Nyx mode
-Nyx is a full system emulation fuzzing environment with snapshot support that
-is built upon KVM and QEMU.
-It is only available on Linux and currently restricted to x86_x64.
+Nyx is a full system emulation fuzzing environment with snapshot support that is
+built upon KVM and QEMU. It is only available on Linux and currently restricted
+to x86_x64.
For binary-only fuzzing a special 5.10 kernel is required.
-See [nyx_mode/README.md](../nyx_mode/README.md)
+See [nyx_mode/README.md](../nyx_mode/README.md).
### Unicorn
@@ -198,15 +199,15 @@ afl-clang-fast's.
### RetroWrite
-RetroWrite is a static binary rewriter that can be combined with AFL++.
-If you have an x86_64 binary that still has its symbols (i.e., not stripped binary),
-is compiled with position independent code (PIC/PIE), and does not contain C++ exceptions,
-then the RetroWrite solution might be for you. It decompiles to ASM files which
-can then be instrumented with afl-gcc.
+RetroWrite is a static binary rewriter that can be combined with AFL++. If you
+have an x86_64 binary that still has its symbols (i.e., not stripped binary), is
+compiled with position independent code (PIC/PIE), and does not contain C++
+exceptions, then the RetroWrite solution might be for you. It decompiles to ASM
+files which can then be instrumented with afl-gcc.
Binaries that are statically instrumented for fuzzing using RetroWrite are close
-in performance to compiler-instrumented binaries and outperform
-the QEMU-based instrumentation.
+in performance to compiler-instrumented binaries and outperform the QEMU-based
+instrumentation.
[https://github.com/HexHive/retrowrite](https://github.com/HexHive/retrowrite)
diff --git a/docs/fuzzing_in_depth.md b/docs/fuzzing_in_depth.md
index 446c4466fa2da1e164794f7cd2e0cdc463cdd3b1..ac72c757eea8ccf88fc816d7e072bdcae6ac953f 100644
--- a/docs/fuzzing_in_depth.md
+++ b/docs/fuzzing_in_depth.md
@@ -141,37 +141,39 @@ options are available:
[instrumentation/README.cmplog.md](../instrumentation/README.cmplog.md).
If you use LTO, LLVM, or GCC_PLUGIN mode
-(afl-clang-fast/afl-clang-lto/afl-gcc-fast), you have the option to
-selectively instrument _parts_ of the target that you are interested in.
-For afl-clang-fast you have to use an llvm version newer than 10.0.0 or a mode
-other than DEFAULT/PCGUARD.
+(afl-clang-fast/afl-clang-lto/afl-gcc-fast), you have the option to selectively
+instrument _parts_ of the target that you are interested in. For afl-clang-fast,
+you have to use an llvm version newer than 10.0.0 or a mode other than
+DEFAULT/PCGUARD.
-This step can be done either by explicitly including parts to be instrumented
-or by explicitly excluding parts from instrumentation.
+This step can be done either by explicitly including parts to be instrumented or
+by explicitly excluding parts from instrumentation.
-* To instrument _only specified parts_
- create a file (eg `allowlist.txt`) with all the filenames and/or functions of
- the source code that should be instrumented and then:
+* To instrument _only specified parts_, create a file (e.g., `allowlist.txt`)
+ with all the filenames and/or functions of the source code that should be
+ instrumented and then:
- 1. just put one filename or function (prefixing with `fun: `) per line (no
- directory information necessary for filenames) in the file `allowlist.txt`.
- Example:
-```
-foo.cpp # will match foo/foo.cpp, bar/foo.cpp, barfoo.cpp etc.
-fun: foo_func # will match the function foo_func
-```
+ 1. Just put one filename or function (prefixing with `fun: `) per line (no
+ directory information necessary for filenames) in the file `allowlist.txt`.
- 2. set `export AFL_LLVM_ALLOWLIST=allowlist.txt` to enable selective positive
+ Example:
+
+ ```
+ foo.cpp # will match foo/foo.cpp, bar/foo.cpp, barfoo.cpp etc.
+ fun: foo_func # will match the function foo_func
+ ```
+
+ 2. Set `export AFL_LLVM_ALLOWLIST=allowlist.txt` to enable selective positive
instrumentation.
-* Similarly to _exclude_ specified parts from instrumentation
- create a file (eg `denylist.txt`) with all the filenames of the source code
- that should be skipped during instrumentation and then
+* Similarly to _exclude_ specified parts from instrumentation, create a file
+ (e.g., `denylist.txt`) with all the filenames of the source code that should
+ be skipped during instrumentation and then:
- 1. same as above just put one filename or function per line in the file
- `denylist.txt`
+ 1. Same as above. Just put one filename or function per line in the file
+ `denylist.txt`.
- 2. set `export AFL_LLVM_DENYLIST=denylist.txt` to enable selective negative
+ 2. Set `export AFL_LLVM_DENYLIST=denylist.txt` to enable selective negative
instrumentation.
**NOTE:** During optimization functions might be
@@ -195,8 +197,8 @@ allows you to find bugs that would not necessarily result in a crash.
Note that sanitizers have a huge impact on CPU (= less executions per second)
and RAM usage. Also, you should only run one afl-fuzz instance per sanitizer
-type. This is enough because e.g. a use-after-free bug will be picked up by
-ASAN (address sanitizer) anyway after syncing test cases from other fuzzing
+type. This is enough because e.g. a use-after-free bug will be picked up by ASAN
+(address sanitizer) anyway after syncing test cases from other fuzzing
instances, so running more than one address sanitized target would be a waste.
The following sanitizers have built-in support in AFL++:
@@ -208,9 +210,9 @@ The following sanitizers have built-in support in AFL++:
local variable that is defined and read before it is even set. Enabled with
`export AFL_USE_MSAN=1` before compiling.
* UBSAN = Undefined Behavior SANitizer, finds instances where - by the C and C++
- standards - undefined behavior happens, e.g., adding two signed integers
- where the result is larger than what a signed integer can hold. Enabled
- with `export AFL_USE_UBSAN=1` before compiling.
+ standards - undefined behavior happens, e.g., adding two signed integers where
+ the result is larger than what a signed integer can hold. Enabled with `export
+ AFL_USE_UBSAN=1` before compiling.
* CFISAN = Control Flow Integrity SANitizer, finds instances where the control
flow is found to be illegal. Originally this was rather to prevent return
oriented programming (ROP) exploit chains from functioning. In fuzzing, this
@@ -224,7 +226,7 @@ The following sanitizers have built-in support in AFL++:
the other sanitizers above this needs `__AFL_LEAK_CHECK();` added to all areas
of the target source code where you find a leak check necessary! Enabled with
`export AFL_USE_LSAN=1` before compiling. To ignore the memory-leaking check
- for certain allocations, `__AFL_LSAN_OFF();` can be used before memory is
+ for certain allocations, `__AFL_LSAN_OFF();` can be used before memory is
allocated, and `__AFL_LSAN_ON();` afterwards. Memory allocated between these
two macros will not be checked for memory leaks.
@@ -286,8 +288,8 @@ Then build the target. (Usually with `make`.)
3. In case the configure/build system complains about AFL++'s compiler and
aborts, then set `export AFL_NOOPT=1` which will then just behave like the
- real compiler and run the configure step separately.
- For building the target afterwards this option has to be unset again!
+ real compiler and run the configure step separately. For building the target
+ afterwards this option has to be unset again!
#### configure
@@ -397,11 +399,12 @@ You can find many good examples of starting files in the
Use the AFL++ tool `afl-cmin` to remove inputs from the corpus that do not
produce a new path/coverage in the target:
-1. Put all files from [step a](#a-collecting-inputs) into one directory, e.g., INPUTS.
+1. Put all files from [step a](#a-collecting-inputs) into one directory, e.g.,
+ `INPUTS`.
2. Run afl-cmin:
- * If the target program is to be called by fuzzing as `bin/target
- INPUTFILE`, replace the INPUTFILE argument that the target program would read
- from with `@@`:
+ * If the target program is to be called by fuzzing as `bin/target INPUTFILE`,
+ replace the INPUTFILE argument that the target program would read from with
+ `@@`:
```
afl-cmin -i INPUTS -o INPUTS_UNIQUE -- bin/target -someopt @@
@@ -448,8 +451,8 @@ In this final step, fuzz the target. There are not that many important options
to run the target - unless you want to use many CPU cores/threads for the
fuzzing, which will make the fuzzing much more useful.
-If you just use one instance for fuzzing, then you are fuzzing just for fun and not
-seriously :-)
+If you just use one instance for fuzzing, then you are fuzzing just for fun and
+not seriously :-)
### a) Running afl-fuzz
@@ -482,14 +485,14 @@ afl-fuzz -i input -o output -- bin/target -someopt @@
Note that the directory specified with `-o` will be created if it does not
exist.
-It can be valuable to run afl-fuzz in a `screen` or `tmux` shell so you can log off,
-or afl-fuzz is not aborted if you are running it in a remote ssh session where
-the connection fails in between. Only do that though once you have verified that
-your fuzzing setup works! Run it like `screen -dmS afl-main -- afl-fuzz -M
-main-$HOSTNAME -i ...` and it will start away in a screen session. To enter this
-session, type `screen -r afl-main`. You see - it makes sense to name the screen
-session same as the afl-fuzz -M/-S naming :-) For more information on screen or
-tmux, check their documentation.
+It can be valuable to run afl-fuzz in a `screen` or `tmux` shell so you can log
+off, or afl-fuzz is not aborted if you are running it in a remote ssh session
+where the connection fails in between. Only do that though once you have
+verified that your fuzzing setup works! Run it like `screen -dmS afl-main --
+afl-fuzz -M main-$HOSTNAME -i ...` and it will start away in a screen session.
+To enter this session, type `screen -r afl-main`. You see - it makes sense to
+name the screen session same as the afl-fuzz `-M`/`-S` naming :-) For more
+information on screen or tmux, check their documentation.
If you need to stop and re-start the fuzzing, use the same command line options
(or even change them by selecting a different power schedule or another mutation
@@ -499,18 +502,21 @@ mode!) and switch the input directory with a dash (`-`):
afl-fuzz -i - -o output -- bin/target -someopt @@
```
-Adding a dictionary is helpful. See the directory
-[dictionaries/](../dictionaries/) if something is already included for your data
-format, and tell afl-fuzz to load that dictionary by adding `-x
+Adding a dictionary is helpful. You have to following options:
+
+* See the directory
+[dictionaries/](../dictionaries/), if something is already included for your
+data format, and tell afl-fuzz to load that dictionary by adding `-x
dictionaries/FORMAT.dict`.
-With `afl-clang-lto`, you have an autodictionary generation for which you need
-to do nothing except to use afl-clang-lto as the compiler.
-With `afl-clang-fast` you can set
-`AFL_LLVM_DICT2FILE=/full/path/to/new/file.dic` to automatically generate a
-dictionary during target compilation.
-You also have the option to generate a dictionary yourself during an independant
-run of the target, see [utils/libtokencap/README.md](../utils/libtokencap/README.md).
-Finally you can also write a dictionary file manually, of course.
+* With `afl-clang-lto`, you have an autodictionary generation for which you need
+ to do nothing except to use afl-clang-lto as the compiler.
+* With `afl-clang-fast`, you can set
+ `AFL_LLVM_DICT2FILE=/full/path/to/new/file.dic` to automatically generate a
+ dictionary during target compilation.
+* You also have the option to generate a dictionary yourself during an
+ independent run of the target, see
+ [utils/libtokencap/README.md](../utils/libtokencap/README.md).
+* Finally, you can also write a dictionary file manually, of course.
afl-fuzz has a variety of options that help to workaround target quirks like
very specific locations for the input file (`-f`), performing deterministic
@@ -572,8 +578,8 @@ can set the cache size (in MB) by setting the environment variable
There should be one main fuzzer (`-M main-$HOSTNAME` option) and as many
secondary fuzzers (e.g., `-S variant1`) as you have cores that you use. Every
--M/-S entry needs a unique name (that can be whatever), however, the same -o
-output directory location has to be used for all instances.
+`-M`/`-S` entry needs a unique name (that can be whatever), however, the same
+`-o` output directory location has to be used for all instances.
For every secondary fuzzer there should be a variation, e.g.:
* one should fuzz the target that was compiled differently: with sanitizers
@@ -588,10 +594,10 @@ For every secondary fuzzer there should be a variation, e.g.:
All other secondaries should be used like this:
* a quarter to a third with the MOpt mutator enabled: `-L 0`
-* run with a different power schedule, recommended are:
- `fast (default), explore, coe, lin, quad, exploit and rare` which you can set
- with the `-p` option, e.g., `-p explore`. See the [FAQ](FAQ.md#what-are-power-schedules)
- for details.
+* run with a different power schedule, recommended are: `fast` (default),
+ `explore`, `coe`, `lin`, `quad`, `exploit`, and `rare` which you can set with
+ the `-p` option, e.g., `-p explore`. See the
+ [FAQ](FAQ.md#what-are-power-schedules) for details.
* a few instances should use the old queue cycling with `-Z`
Also, it is recommended to set `export AFL_IMPORT_FIRST=1` to load test cases
@@ -615,7 +621,7 @@ A long list can be found at
[https://github.com/Microsvuln/Awesome-AFL](https://github.com/Microsvuln/Awesome-AFL).
However, you can also sync AFL++ with honggfuzz, libfuzzer with `-entropic=1`,
-etc. Just show the main fuzzer (-M) with the `-F` option where the queue/work
+etc. Just show the main fuzzer (`-M`) with the `-F` option where the queue/work
directory of a different fuzzer is, e.g., `-F /src/target/honggfuzz`. Using
honggfuzz (with `-n 1` or `-n 2`) and libfuzzer in parallel is highly
recommended!
@@ -877,9 +883,9 @@ normal fuzzing campaigns as these are much shorter runnings.
1. Always:
* LTO has a much longer compile time which is diametrical to short fuzzing -
hence use afl-clang-fast instead.
- * If you compile with CMPLOG, then you can save compilation time and reuse that
- compiled target with the `-c` option and as the main fuzz target. This
- will impact the speed by ~15% though.
+ * If you compile with CMPLOG, then you can save compilation time and reuse
+ that compiled target with the `-c` option and as the main fuzz target.
+ This will impact the speed by ~15% though.
* `AFL_FAST_CAL` - enables fast calibration, this halves the time the
saturated corpus needs to be loaded.
* `AFL_CMPLOG_ONLY_NEW` - only perform cmplog on new finds, not the initial
@@ -909,8 +915,8 @@ and
## The End
-Check out the [FAQ](FAQ.md). Maybe it answers your question (that you might
-not even have known you had ;-) ).
+Check out the [FAQ](FAQ.md). Maybe it answers your question (that you might not
+even have known you had ;-) ).
This is basically all you need to know to professionally run fuzzing campaigns.
If you want to know more, the tons of texts in [docs/](./) will have you
diff --git a/docs/important_changes.md b/docs/important_changes.md
index 39fe56b956be9d9e1bd5266c9ebc5721690fd7d4..e847f360f7878eed64491452a210fc94571981d7 100644
--- a/docs/important_changes.md
+++ b/docs/important_changes.md
@@ -7,23 +7,23 @@ changes.
With AFL++ 4.00, we introduced the following changes from previous behaviors:
* the complete documentation was overhauled and restructured thanks to @llzmb!
- * a new CMPLOG target format requires recompiling CMPLOG targets for use
- with afl++ 4.0 onwards
+ * a new CMPLOG target format requires recompiling CMPLOG targets for use with
+ AFL++ 4.0 onwards
* better naming for several fields in the UI
With AFL++ 3.15, we introduced the following changes from previous behaviors:
- * afl-cmin and afl-showmap -Ci now descend into subdirectories like afl-fuzz
- -i does (but note that afl-cmin.bash does not)
+ * afl-cmin and afl-showmap `-Ci` now descend into subdirectories like afl-fuzz
+ `-i` does (but note that afl-cmin.bash does not)
With AFL++ 3.14, we introduced the following changes from previous behaviors:
- * afl-fuzz: deterministic fuzzing is not a default for -M main anymore
+ * afl-fuzz: deterministic fuzzing is not a default for `-M main` anymore
* afl-cmin/afl-showmap -i now descends into subdirectories (afl-cmin.bash,
however, does not)
With AFL++ 3.10, we introduced the following changes from previous behaviors:
- * The '+' feature of the '-t' option now means to auto-calculate the timeout
+ * The '+' feature of the `-t` option now means to auto-calculate the timeout
with the value given being the maximum timeout. The original meaning of
- "skipping timeouts instead of abort" is now inherent to the -t option.
+ "skipping timeouts instead of abort" is now inherent to the `-t` option.
With AFL++ 3.00, we introduced changes that break some previous AFL and AFL++
behaviors and defaults:
@@ -41,19 +41,20 @@ behaviors and defaults:
if any were given. This allows to fuzz targets build regularly like those
for debug or release versions.
* afl-fuzz:
- * if neither -M or -S is specified, `-S default` is assumed, so more fuzzers
- can easily be added later
+ * if neither `-M` or `-S` is specified, `-S default` is assumed, so more
+ fuzzers can easily be added later
* `-i` input directory option now descends into subdirectories. It also does
not fail on crashes and too large files, instead it skips them and uses
them for splicing mutations
- * -m none is now the default, set memory limits (in MB) with, e.g., -m 250
- * deterministic fuzzing is now disabled by default (unless using -M) and can
- be enabled with -D
+ * `-m` none is now the default, set memory limits (in MB) with, e.g., `-m
+ 250`
+ * deterministic fuzzing is now disabled by default (unless using `-M`) and
+ can be enabled with `-D`
* a caching of test cases can now be performed and can be modified by
- editing config.h for TESTCASE_CACHE or by specifying the environment
+ editing config.h for `TESTCASE_CACHE` or by specifying the environment
variable `AFL_TESTCACHE_SIZE` (in MB). Good values are between 50-500
(default: 50).
- * -M mains do not perform trimming
- * examples/ got renamed to utils/
- * libtokencap/ libdislocator/ and qdbi_mode/ were moved to utils/
- * afl-cmin/afl-cmin.bash now search first in PATH and last in AFL_PATH
+ * `-M` mains do not perform trimming
+ * `examples/` got renamed to `utils/`
+ * `libtokencap/`, `libdislocator/`, and `qdbi_mode/` were moved to `utils/`
+ * afl-cmin/afl-cmin.bash now search first in `PATH` and last in `AFL_PATH`
diff --git a/docs/tutorials.md b/docs/tutorials.md
index 9d4f50ebf25907cba3e575e1b77cbc74e94b7f57..64d2b376851d37d14a523d24fe99d2c60bd01470 100644
--- a/docs/tutorials.md
+++ b/docs/tutorials.md
@@ -28,7 +28,7 @@ structure is), these links have you covered:
* Superion for AFL++:
[https://github.com/adrian-rt/superion-mutator](https://github.com/adrian-rt/superion-mutator)
-# Video Tutorials
+## Video Tutorials
* [Install AFL++ Ubuntu](https://www.youtube.com/watch?v=5dCvhkbi3RA)
* [[Fuzzing with AFLplusplus] Installing AFLPlusplus and fuzzing a simple C program](https://www.youtube.com/watch?v=9wRVo0kYSlc)
* [[Fuzzing with AFLplusplus] How to fuzz a binary with no source code on Linux in persistent mode](https://www.youtube.com/watch?v=LGPJdEO02p4)
diff --git a/include/config.h b/include/config.h
index 99cacc40c2d1b6d8ba81a35ae2d0a0be17044c8c..66a646b121bad04ae4abf47d5929ad855c239d78 100644
--- a/include/config.h
+++ b/include/config.h
@@ -26,7 +26,7 @@
/* Version string: */
// c = release, a = volatile github dev, e = experimental branch
-#define VERSION "++3.15a"
+#define VERSION "++4.00c"
/******************************************************
* *
diff --git a/include/forkserver.h b/include/forkserver.h
index 48db2e266a573c0008dc7738b1dc3287ed48f902..01f45587ee1e1aa10c07e5bba0c77885613012f1 100644
--- a/include/forkserver.h
+++ b/include/forkserver.h
@@ -53,8 +53,14 @@ typedef enum NyxReturnValue {
typedef struct {
- void *(*nyx_new)(const char *sharedir, const char *workdir,
- uint32_t worker_id, uint32_t cpu_id, bool create_snapshot);
+ void *(*nyx_new)(const char *sharedir, const char *workdir, uint32_t cpu_id,
+ uint32_t input_buffer_size,
+ bool input_buffer_write_protection);
+ void *(*nyx_new_parent)(const char *sharedir, const char *workdir,
+ uint32_t cpu_id, uint32_t input_buffer_size,
+ bool input_buffer_write_protection);
+ void *(*nyx_new_child)(const char *sharedir, const char *workdir,
+ uint32_t cpu_id, uint32_t worker_id);
void (*nyx_shutdown)(void *qemu_process);
void (*nyx_option_set_reload_mode)(void *qemu_process, bool enable);
void (*nyx_option_set_timeout)(void *qemu_process, uint8_t timeout_sec,
diff --git a/instrumentation/README.cmplog.md b/instrumentation/README.cmplog.md
index a2caca4f746a53f2e1f6dbba3d2b9d44b19252a0..8a9fd37224286d328289b7691fc8ceb9bf40ccf5 100644
--- a/instrumentation/README.cmplog.md
+++ b/instrumentation/README.cmplog.md
@@ -4,9 +4,8 @@ The CmpLog instrumentation enables logging of comparison operands in a shared
memory.
These values can be used by various mutators built on top of it. At the moment,
-we support the RedQueen mutator (input-2-state instructions only), for details
-see
-[the RedQueen paper](https://www.syssec.ruhr-uni-bochum.de/media/emma/veroeffentlichungen/2018/12/17/NDSS19-Redqueen.pdf).
+we support the Redqueen mutator (input-2-state instructions only), for details
+see [the Redqueen paper](https://github.com/RUB-SysSec/redqueen).
## Build
diff --git a/instrumentation/afl-compiler-rt.o.c b/instrumentation/afl-compiler-rt.o.c
index a84f31e3b72a5b5a1d2807e2d15672da79bfb3d5..59839750b10836af48ac404aa8336acc997125b1 100644
--- a/instrumentation/afl-compiler-rt.o.c
+++ b/instrumentation/afl-compiler-rt.o.c
@@ -154,7 +154,14 @@ static int __afl_dummy_fd[2] = {2, 2};
static void at_exit(int signal) {
- if (child_pid > 0) { kill(child_pid, SIGKILL); }
+ if (unlikely(child_pid > 0)) {
+
+ kill(child_pid, SIGKILL);
+ child_pid = -1;
+
+ }
+
+ _exit(0);
}
diff --git a/nyx_mode/LIBNYX_VERSION b/nyx_mode/LIBNYX_VERSION
index 1ac5611b769debfc24bb1971d56fcf0d0a027a09..b45b4e90a761f1279fd3202b211a36aeebf845fd 100644
--- a/nyx_mode/LIBNYX_VERSION
+++ b/nyx_mode/LIBNYX_VERSION
@@ -1 +1 @@
-ecbcb2d
+2e45754
diff --git a/nyx_mode/PACKER_VERSION b/nyx_mode/PACKER_VERSION
index 2596e40f7ff132b2da88f13a34955ca41754eb3c..434881147e8de3e50f40e0bcc604e96d70242e2c 100644
--- a/nyx_mode/PACKER_VERSION
+++ b/nyx_mode/PACKER_VERSION
@@ -1 +1 @@
-f91742c
+76100c5
diff --git a/nyx_mode/QEMU-Nyx b/nyx_mode/QEMU-Nyx
index d5a7011ad20ba5ba91f1371f9d40154035d5d768..c2c69cfc528398d9db9363b92f8c50db4008c98f 160000
--- a/nyx_mode/QEMU-Nyx
+++ b/nyx_mode/QEMU-Nyx
@@ -1 +1 @@
-Subproject commit d5a7011ad20ba5ba91f1371f9d40154035d5d768
+Subproject commit c2c69cfc528398d9db9363b92f8c50db4008c98f
diff --git a/nyx_mode/QEMU_NXY_VERSION b/nyx_mode/QEMU_NXY_VERSION
deleted file mode 100644
index d2f0328b337d9c90bfed86fc02bcd5bc5979a253..0000000000000000000000000000000000000000
--- a/nyx_mode/QEMU_NXY_VERSION
+++ /dev/null
@@ -1 +0,0 @@
-acc90e462b
diff --git a/nyx_mode/QEMU_NYX_VERSION b/nyx_mode/QEMU_NYX_VERSION
new file mode 100644
index 0000000000000000000000000000000000000000..be13a784b4bc9c4e6863dbe039b0b83d9b890685
--- /dev/null
+++ b/nyx_mode/QEMU_NYX_VERSION
@@ -0,0 +1 @@
+c2c69cfc52
diff --git a/nyx_mode/README.md b/nyx_mode/README.md
index f975c7646dd342fb459eed3767aa1b5301353be1..09421f271b01ec7e0c83a05d1fef55afb9f4aa06 100644
--- a/nyx_mode/README.md
+++ b/nyx_mode/README.md
@@ -1,7 +1,7 @@
-# Nyx Mode
+# Nyx mode
-Nyx is a full system emulation fuzzing mode that supports snapshotting and
-can be used for both source code based instrumentation and binary-only targets.
+Nyx is a full system emulation fuzzing mode that supports snapshotting and can
+be used for both source code based instrumentation and binary-only targets.
It is recommended to be used if the target cannot be fuzzed in persistent mode
(so default fork mode fuzzing is used).
@@ -10,80 +10,83 @@ It is only available on Linux and is currently restricted to x86_x64 however
aarch64 support is in the works (but the host must then run on aarch64 too).
Underneath it is built upon KVM and QEMU and requires a modern Linux kernel
-(5.11+) for fuzzing source code based instrumented targets (e.g.
-`afl-clang-fast`). To fuzz binary-only targets, this is done via Intel PT
-and requires an Intel processor (6th generation onwards) and a special
-5.10 kernel (see [KVM-Nyx](https://github.com/nyx-fuzz/KVM-Nyx)).
+(5.11+) for fuzzing source code based instrumented targets (e.g.,
+`afl-clang-fast`). To fuzz binary-only targets, this is done via Intel PT and
+requires an Intel processor (6th generation onwards) and a special 5.10 kernel
+(see [KVM-Nyx](https://github.com/nyx-fuzz/KVM-Nyx)).
## Building Nyx mode
1. Install all the packages from [docs/INSTALL.md](../docs/INSTALL.md).
-2. Additionally install the following packages:
+2. Additionally, install the following packages:
-```shell
-apt-get install -y libgtk-3-dev pax-utils python3-msgpack python3-jinja2
-```
+ ```shell
+ apt-get install -y libgtk-3-dev pax-utils python3-msgpack python3-jinja2
+ ```
-3. As Nyx is written in Rust, install the newest rust compiler (rust packages
- in the Linux distribution are usually too old to be able to build Nyx):
+3. As Nyx is written in Rust, install the newest rust compiler (rust packages in
+ the Linux distribution are usually too old to be able to build Nyx):
-```shell
-curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
-```
+ ```shell
+ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
+ ```
4. Finally build Nyx mode:
-```shell
-./build_nyx_support.sh
-```
+ ```shell
+ ./build_nyx_support.sh
+ ```
5. Optionally, for binary-only fuzzing: set up the required 5.10 kernel, see
- [KVM-Nyx](https://github.com/nyx-fuzz/KVM-Nyx).
+ [KVM-Nyx](https://github.com/nyx-fuzz/KVM-Nyx).
## Preparing to fuzz a target with Nyx mode
+For source instrumented fuzzing you can use any afl-cc mode, with LTO even
+auto-dictionary is supported.
+Note the CMPLOG is currently not supported (yet).
+
Nyx uses full system emulation hence your fuzzing targets have to be especially
packaged.
-**For source code based instrumentation with `afl-clang-fast` for the time
-being these must be instrumented to `AFL_LLVM_INSTRUMENT=AFL` to work!**
-
With your target ready at hand execute the following command
(note that for binary-only fuzzing with the special 5.10 kernel switch the
-option `instrumentation` below with `process_trace`):
+option `instrumentation` below with `processor_trace`):
```shell
python3 nyx_mode/packer/packer/nyx_packer.py \
- /PATH/TO/TARGET \
- PACKAGE-DIRECTORY \
- afl \
- instrumentation \
- --fast_reload_mode \
- --purge
+ /PATH/TO/TARGET \
+ PACKAGE-DIRECTORY \
+ afl \
+ instrumentation \
+ --fast_reload_mode \
+ --purge
```
This will create a directory with all necessary files and the Nyx configuration.
-The name of the directory will be whatever you choose for PACKAGE-DIRECTORY
+The name of the directory will be whatever you choose for `PACKAGE-DIRECTORY`
above.
In the final step for the packaging we generate the Nyx configuration:
+
```shell
python3 nyx_mode/packer/packer/nyx_config_gen.py PACKAGE-DIRECTORY Kernel
```
## Fuzzing with Nyx mode
-All the hard parts are done, fuzzing with Nyx mode is easy - just supply
-the PACKAGE-DIRECTORY as fuzzing target and specify the `-X` option to afl-fuzz:
+All the hard parts are done, fuzzing with Nyx mode is easy - just supply the
+`PACKAGE-DIRECTORY` as fuzzing target and specify the `-X` option to afl-fuzz:
```shell
afl-fuzz -i in -o out -X -- ./PACKAGE-DIRECTORY
```
Most likely your first run will fail because the Linux modules have to be
-specially set up, but afl-fuzz will tell you this on startup and how to
-rectify the situation:
+specially set up, but afl-fuzz will tell you this on startup and how to rectify
+the situation:
+
```
sudo modprobe -r kvm-intel # or kvm-amd for AMD processors
sudo modprobe -r kvm
@@ -94,10 +97,10 @@ sudo modprobe kvm-intel # or kvm-amd for AMD processors
If you want to fuzz in parallel (and you should!), then this has to be done in a
special way:
- * Instead of `-X` (standalone mode) you specify `-Y` (multi processor mode).
- * First a Main afl-fuzz instance has to be started with `-M 0`
- * Only afterwards can you start Secondary afl-fuzz instances, which must have
- an increasing number value, starting at 1, e.g. `-S 1`
+* Instead of `-X` (standalone mode), you specify `-Y` (multi processor mode).
+* First, a Main afl-fuzz instance has to be started with `-M 0`.
+* Only afterwards you can start Secondary afl-fuzz instances, which must have an
+ increasing number value, starting at 1, e.g., `-S 1`.
```shell
afl-fuzz -i in -o out -Y -M 0 -- ./PACKAGE-DIRECTORY
@@ -115,21 +118,22 @@ afl-fuzz -i in -o out -Y -S 2 -- ./PACKAGE-DIRECTORY
### Fuzzing libxml2 with AFL++ in Nyx-mode
-This tutorial is based on the [Fuzzing libxml2 with AFL++](https://aflplus.plus/docs/tutorials/libxml2_tutorial/) tutorial.
+This tutorial is based on the
+[Fuzzing libxml2 with AFL++](https://aflplus.plus/docs/tutorials/libxml2_tutorial/)
+tutorial.
-### Preparing libxml2
+### Preparing libxml2
-First, get the latest libxml2 source files by using `git`:
+First, get the latest libxml2 source files by using `git`:
```
git clone https://gitlab.gnome.org/GNOME/libxml2
cd libxml2
```
-Remember that currently only classic AFL instrumentation is supported!
+Next, compile libxml2:
```
-export AFL_LLVM_INSTRUMENT=AFL
./autogen.sh
./configure --enable-shared=no
make CC=afl-clang-fast CXX=afl-clang-fast++ LD=afl-clang-fast
@@ -139,43 +143,65 @@ make CC=afl-clang-fast CXX=afl-clang-fast++ LD=afl-clang-fast
Nyx expects that the target is provided in a certain format. More specifically, the target is passed as a so-called „share directory“ to a Nyx-frontend implementation. The share directory contains the target as well as a folder containing all dependencies and other files that are copied over to the guest. But more importantly, this share directory also contains a bootstrap script (`fuzz.sh`if you are using `KVM-Nyx`otherwise `fuzz_no_pt.sh`) that is also executed right after launching the fuzzer. Both bootstrap scripts use several tools to communicate with the "outer world":
-- `hcat` - this tool copies a given string to the host
-- `hget` - this program requests a file from the host's share directory
-- `hget_bulk` - an improved version of `hget`. It is quite useful if you want to transfer huge files. But please keep in mind that this version of `hget` has a much larger startup overhead and won't improve your transfer rates on small files (typically files smaller than 100MB).
-- `habort` - this tool basically sends an abort signal to the host (useful if something went wrong during bootstrap)
-- `hpush` - a tool to transfer a given file to the host (the transfered file will be put in the `dump/` folder of your Nyx workdir)
-
-Those tools are all using hypercalls which are defined in `packer/nyx.h`. We will give some more examples later on how to use these hypercalls directly to implement custom fuzzing harnesses.
+- `hcat` - this tool copies a given string to the host
+- `hget` - this program requests a file from the host's share directory
+- `hget_bulk` - an improved version of `hget`. It is quite useful if you want to
+ transfer huge files. But please keep in mind that this version of `hget` has a
+ much larger startup overhead and won't improve your transfer rates on small
+ files (typically files smaller than 100 MB).
+- `habort` - this tool basically sends an abort signal to the host (useful if
+ something went wrong during bootstrap)
+- `hpush` - a tool to transfer a given file to the host (the transferred file
+ will be put in the `dump/` folder of your Nyx workdir)
+
+Those tools are all using hypercalls which are defined in `packer/nyx.h`. We
+will give some more examples later on how to use these hypercalls directly to
+implement custom fuzzing harnesses.
### Pack libxml2 into Nyx sharedir format
-To turn a given linux target into the Nyx format, you can simply use `nyx_packer.py`. To do so, move to the following directory:
+To turn a given linux target into the Nyx format, you can simply use
+`nyx_packer.py`. To do so, move to the following directory:
```
cd nyx_mode/packer/packer
```
- And run the tool with the following options to pack `libxml2`:
+And run the tool with the following options to pack `libxml2`:
-```.
-python3 ./nyx_packer.py \
- ~/libxml2/xmllint \
- /tmp/nyx_libxml2 \
- afl \
- instrumentation \
- -args "/tmp/input" \
- -file "/tmp/input" \
- --fast_reload_mode \
- --purge
```
-
-In this example, the packer will take `xmllint`, recursively get all dependencies and put both into the specified share directory (`/tmp/nyx_libxml2` in this case). Because we have selected the `afl` option, an `ld_preload`-based agent is also automatically built and put into the sharedir. Another option would be `spec`. Without going into too much detail here, the `spec`mode is only used by Nyx's [spec-fuzzer](https://github.com/nyx-fuzz/spec-fuzzer) implementation. Next, since our target is built with compile-time instrumentations, we must select the `instrumentation` option, otherwise we could also use `processor-trace` option to enable Intel-PT fuzzing on targets without instrumentation.
-
-To specify that the input generated by the fuzzer is passed as a seperate file to the target, we need to set the `-file` option. Otherwise, the input will be passed over to the target via `stdin`. To specify any required `argv` options you can use the `-args`parameter.
-
-In case you want to fuzz the target only with fast snapshots enabled, you can also set the `--fast_reload_mode` option to improve performance.
-
-Finally, we need to generate a Nyx configuration file. Simply run the following command and you're good to proceed:
+python3 ./nyx_packer.py \
+ ~/libxml2/xmllint \
+ /tmp/nyx_libxml2 \
+ afl \
+ instrumentation \
+ -args "/tmp/input" \
+ -file "/tmp/input" \
+ --fast_reload_mode \
+ --purge
+```
+
+In this example, the packer will take `xmllint`, recursively get all
+dependencies and put both into the specified share directory (`/tmp/nyx_libxml2`
+in this case). Because we have selected the `afl` option, an `ld_preload`-based
+agent is also automatically built and put into the sharedir. Another option
+would be `spec`. Without going into too much detail here, the `spec` mode is
+only used by Nyx's [spec-fuzzer](https://github.com/nyx-fuzz/spec-fuzzer)
+implementation. Next, since our target is built with compile-time
+instrumentations, we must select the `instrumentation` option, otherwise we
+could also use `processor-trace` option to enable Intel-PT fuzzing on targets
+without instrumentation.
+
+To specify that the input generated by the fuzzer is passed as a separate file
+to the target, we need to set the `-file` option. Otherwise, the input will be
+passed over to the target via `stdin`. To specify any required `argv` options,
+you can use the `-args` parameter.
+
+In case you want to fuzz the target only with fast snapshots enabled, you can
+also set the `--fast_reload_mode` option to improve performance.
+
+Finally, we need to generate a Nyx configuration file. Simply run the following
+command and you're good to proceed:
```
python3 ./nyx_config_gen.py /tmp/nyx_libxml2/ Kernel
@@ -183,15 +209,17 @@ python3 ./nyx_config_gen.py /tmp/nyx_libxml2/ Kernel
### Run Nyx mode
-From here on, we are almost done. Move to the AFL++ top directory and start the fuzzer with the following arguments:
+From here on, we are almost done. Move to the AFL++ top directory and start the
+fuzzer with the following arguments:
```shell
-mkdir /tmp/in/ # create an input folder
-echo "AAAA" >> /tmp/in/A # create a dummy input file
+mkdir /tmp/in/ # create an input folder
+echo "AAAA" >> /tmp/in/A # create a dummy input file
./afl-fuzz -i /tmp/in/ -o /tmp/out -X /tmp/nyx_libxml2/
```
-If everything has been successfully set up to this point, you will now be welcomed by the following AFL++ screen:
+If everything has been successfully set up to this point, you will now be
+welcomed by the following AFL++ screen:
```
american fuzzy lop ++3.15a {default} (/tmp/nyx_libxml2/) [fast] - NYX
@@ -220,46 +248,64 @@ If everything has been successfully set up to this point, you will now be welcom
└────────────────────────────────────────────────────┘
```
-If you want to run the fuzzer in distributed mode, which might be especially useful if you want to keep your memory footprint low, we got you covered. To start an initiating `parent` process, which will also create the snapshot which is later shared across all other `child`s, simply run AFL++Nyx with the following arguments:
+If you want to run the fuzzer in distributed mode, which might be especially
+useful if you want to keep your memory footprint low, we got you covered. To
+start an initiating `parent` process, which will also create the snapshot which
+is later shared across all other `child`s, simply run AFL++Nyx with the
+following arguments:
```
./afl-fuzz -i /tmp/in/ -o /tmp/out -d -Y -M 0 /tmp/nyx_libxml2/
```
-To attach other child processes adjust the `-S <id>` and run the following command:
+To attach other child processes adjust the `-S <id>` and run the following
+command:
```
./afl-fuzz -i /tmp/in/ -o /tmp/out -d -Y -S 1 /tmp/nyx_libxml2/
```
-If you want to disable fast snapshots (except for crashes), you can simply set the `NYX_DISABLE_SNAPSHOT_MODE` environment variable.
+If you want to disable fast snapshots (except for crashes), you can simply set
+the `NYX_DISABLE_SNAPSHOT_MODE` environment variable.
### Run AFL++Nyx with a custom agent
-Most of the common use-cases for linux userland targets are already handled by our general purpose [agent](https://github.com/nyx-fuzz/packer/blob/main/packer/linux_x86_64-userspace/src/ld_preload_fuzz.c) implementation. But in case you want to build your own agent, or write a custom harness for a specific target or you just want to implement all the hypercall and shared memory communication on your own, you can use our custom harness example as a starting point for that. You can find the code [here](custom_harness/)
+Most of the common use-cases for linux userland targets are already handled by
+our general purpose
+[agent](https://github.com/nyx-fuzz/packer/blob/main/packer/linux_x86_64-userspace/src/ld_preload_fuzz.c)
+implementation. But in case you want to build your own agent, or write a custom
+harness for a specific target or you just want to implement all the hypercall
+and shared memory communication on your own, you can use our custom harness
+example as a starting point for that. You can find the code in
+[custom_harness/](./custom_harness/).
-This custom harness can be statically compiled with by gcc or clang. There is no need to use an AFL compiler, because this agent implements its own very basic coverage tracking by simply setting specific bytes in the "coverage" bitmap after specific branches have been covered.
+This custom harness can be statically compiled with by gcc or clang. There is no
+need to use an AFL compiler, because this agent implements its own very basic
+coverage tracking by simply setting specific bytes in the "coverage" bitmap
+after specific branches have been covered.
-To prepare this target, we must first create a new folder that will later become the sharedir.
+To prepare this target, we must first create a new folder that will later become
+the sharedir.
````
mkdir /tmp/nyx_custom_agent/
````
- To compile this example, run the following command (remove the `-DNO_PT_NYX` option if you are using KVM-Nyx ):
+To compile this example, run the following command (remove the `-DNO_PT_NYX`
+option if you are using KVM-Nyx):
```
-gcc example.c -DNO_PT_NYX -static -I ./packer/ -o /tmp/nyx_custom_agent/target
+gcc example.c -DNO_PT_NYX -static -I ../packer/ -o /tmp/nyx_custom_agent/target
```
-Copy both bootstrap scripts into the sharedir:
+Copy both bootstrap scripts into the sharedir:
```
cp fuzz.sh /tmp/nyx_custom_agent
cp fuzz_no_pt.sh /tmp/nyx_custom_agent
```
-Copy all `htools` executables into the sharedir:
+Copy all `htools` executables into the sharedir:
```
cd ~/AFLplusplus/packer/packer/linux_x86_64-userspace/
@@ -267,7 +313,7 @@ sh compile_64.sh
cp bin64/h* /tmp/nyx_custom_agent/
```
-And finally, generate a Nyx configuration:
+And finally, generate a Nyx configuration:
```
cd ~/AFLplusplus/packer/packer
diff --git a/nyx_mode/build_nyx_support.sh b/nyx_mode/build_nyx_support.sh
index 8626342dfd89ab4b3ee235e8834478e700a3856c..b6c1d54eff8f951c06371080652efde9938b5765 100755
--- a/nyx_mode/build_nyx_support.sh
+++ b/nyx_mode/build_nyx_support.sh
@@ -53,7 +53,7 @@ fi
echo "[*] Checking QEMU-Nyx ..."
if [ ! -f "QEMU-Nyx/x86_64-softmmu/qemu-system-x86_64" ]; then
cd QEMU-Nyx/
- ./compile_qemu_nyx.sh || exit 1
+ ./compile_qemu_nyx.sh static || exit 1
cd ..
fi
diff --git a/nyx_mode/custom_harness/example.c b/nyx_mode/custom_harness/example.c
index 0b12e60bf658c652ab19bf7e1fc6082bd3fd3351..dd268534ef4a291f392f47dd5d7e8c60a0fb44d0 100644
--- a/nyx_mode/custom_harness/example.c
+++ b/nyx_mode/custom_harness/example.c
@@ -4,88 +4,137 @@
#include <inttypes.h>
#include "nyx.h"
-/* this is our "bitmap" that is later shared with the fuzzer (you can also pass the pointer of the bitmap used by compile-time instrumentations in your target) */
-uint8_t* trace_buffer[64*1024] = {0};
-
-int main(int argc, char** argv){
- /* if you want to debug code running in Nyx, hprintf() is the way to go.
- * Long story short -- it's just a guest-to-hypervisor printf. Hence the name "hprintf"
- */
- hprintf("Agent test\n");
-
- /* Request information on available (host) capabilites (optional) */
- host_config_t host_config;
- kAFL_hypercall(HYPERCALL_KAFL_GET_HOST_CONFIG, (uintptr_t)&host_config);
- hprintf("[capablities] host_config.bitmap_size: 0x%"PRIx64"\n", host_config.bitmap_size);
- hprintf("[capablities] host_config.ijon_bitmap_size: 0x%"PRIx64"\n", host_config.ijon_bitmap_size);
- hprintf("[capablities] host_config.payload_buffer_size: 0x%"PRIx64"x\n", host_config.payload_buffer_size);
-
- /* Submit agent configuration */
- memset(trace_buffer, 0, 64*1024); // makes sure that the bitmap buffer is already mapped into the guest's memory (alternatively you can use mlock) */
- agent_config_t agent_config = {0};
- agent_config.agent_timeout_detection = 0; /* timeout detection is implemented by the agent (currently not used) */
- agent_config.agent_tracing = 1; /* set this flag to propagade that instrumentation-based fuzzing is availabe */
- agent_config.agent_ijon_tracing = 0; /* set this flag to propagade that IJON extension is implmented agent-wise */
- agent_config.trace_buffer_vaddr = (uintptr_t)trace_buffer; /* trace "bitmap" pointer - required for instrumentation-only fuzzing */
- agent_config.ijon_trace_buffer_vaddr = (uintptr_t)NULL; /* "IJON" buffer pointer */
- agent_config.agent_non_reload_mode = 1; /* non-reload mode is supported (usually because the agent implements a fork-server; currently not used) */
- kAFL_hypercall(HYPERCALL_KAFL_SET_AGENT_CONFIG, (uintptr_t)&agent_config);
-
- /* Tell hypervisor the virtual address of the payload (input) buffer (call mlock to ensure that this buffer stays in the guest's memory)*/
- kAFL_payload* payload_buffer = mmap((void*)0x4000000ULL, PAYLOAD_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
- mlock(payload_buffer, (size_t)PAYLOAD_SIZE);
- memset(payload_buffer, 0, PAYLOAD_SIZE);
- kAFL_hypercall(HYPERCALL_KAFL_GET_PAYLOAD, (uintptr_t)payload_buffer);
- hprintf("[init] payload buffer is mapped at %p\n", payload_buffer);
-
- /* the main fuzzing loop */
- while(1){
-
- /* Creates a root snapshot on first execution. Also we requested the next input with this hypercall */
- kAFL_hypercall(HYPERCALL_KAFL_USER_FAST_ACQUIRE, 0); // root snapshot <--
+#define TRACE_BUFFER_SIZE (64)
+
+#define PAGE_SIZE 0x1000
+#define MMAP_SIZE(x) ((x & ~(PAGE_SIZE-1)) + PAGE_SIZE)
+
+int main(int argc, char **argv) {
+
+ /* if you want to debug code running in Nyx, hprintf() is the way to go.
+ * Long story short -- it's just a guest-to-hypervisor printf. Hence the name
+ * "hprintf"
+ */
+ hprintf("Agent test\n");
+
+ /* Request information on available (host) capabilites (optional) */
+ host_config_t host_config;
+ kAFL_hypercall(HYPERCALL_KAFL_GET_HOST_CONFIG, (uintptr_t)&host_config);
+ hprintf("[capablities] host_config.bitmap_size: 0x%" PRIx64 "\n",
+ host_config.bitmap_size);
+ hprintf("[capablities] host_config.ijon_bitmap_size: 0x%" PRIx64 "\n",
+ host_config.ijon_bitmap_size);
+ hprintf("[capablities] host_config.payload_buffer_size: 0x%" PRIx64 "x\n",
+ host_config.payload_buffer_size);
+
+ /* this is our "bitmap" that is later shared with the fuzzer (you can also
+ * pass the pointer of the bitmap used by compile-time instrumentations in
+ * your target) */
+ uint8_t *trace_buffer = mmap(NULL, MMAP_SIZE(TRACE_BUFFER_SIZE), PROT_READ |
+ PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, -1, 0);
+ memset(trace_buffer, 0,
+ TRACE_BUFFER_SIZE); // makes sure that the bitmap buffer is already
+ // mapped into the guest's memory (alternatively
+ // you can use mlock) */
+
+ /* Submit agent configuration */
+ agent_config_t agent_config = {0};
+ agent_config.agent_magic = NYX_AGENT_MAGIC;
+ agent_config.agent_version = NYX_AGENT_VERSION;
+ agent_config.agent_timeout_detection =
+ 0; /* timeout detection is implemented by the agent (currently not used)
+ */
+ agent_config.agent_tracing =
+ 1; /* set this flag to propagade that instrumentation-based fuzzing is
+ availabe */
+ agent_config.agent_ijon_tracing = 0; /* set this flag to propagade that IJON
+ extension is implmented agent-wise */
+ agent_config.trace_buffer_vaddr =
+ (uintptr_t)trace_buffer; /* trace "bitmap" pointer - required for
+ instrumentation-only fuzzing */
+ agent_config.ijon_trace_buffer_vaddr =
+ (uintptr_t)NULL; /* "IJON" buffer pointer */
+ agent_config.agent_non_reload_mode =
+ 1; /* non-reload mode is supported (usually because the agent implements a
+ fork-server; currently not used) */
+ agent_config.coverage_bitmap_size = TRACE_BUFFER_SIZE;
+ kAFL_hypercall(HYPERCALL_KAFL_SET_AGENT_CONFIG, (uintptr_t)&agent_config);
+
+ /* Tell hypervisor the virtual address of the payload (input) buffer (call
+ * mlock to ensure that this buffer stays in the guest's memory)*/
+ kAFL_payload *payload_buffer =
+ mmap(NULL, host_config.payload_buffer_size, PROT_READ | PROT_WRITE,
+ MAP_SHARED | MAP_ANONYMOUS, -1, 0);
+ mlock(payload_buffer, (size_t)host_config.payload_buffer_size);
+ memset(payload_buffer, 0, host_config.payload_buffer_size);
+ kAFL_hypercall(HYPERCALL_KAFL_GET_PAYLOAD, (uintptr_t)payload_buffer);
+ hprintf("[init] payload buffer is mapped at %p\n", payload_buffer);
+
+ /* the main fuzzing loop */
+ while (1) {
+
+ /* Creates a root snapshot on first execution. Also we requested the next
+ * input with this hypercall */
+ kAFL_hypercall(HYPERCALL_KAFL_USER_FAST_ACQUIRE, 0); // root snapshot <--
#ifdef DEBUG
- hprintf("Size: %ld Data: %x %x %x %x\n", payload_buffer->size,
- payload_buffer->data[4],
- payload_buffer->data[5],
- payload_buffer->data[6],
- payload_buffer->data[7]
- );
+ hprintf("Size: %ld Data: %x %x %x %x\n", payload_buffer->size,
+ payload_buffer->data[4], payload_buffer->data[5],
+ payload_buffer->data[6], payload_buffer->data[7]);
#endif
- uint32_t len = payload_buffer->size;
-
- /* set a byte to make AFL++ happy (otherwise the fuzzer might refuse to start fuzzing at all) */
- ((uint8_t*)trace_buffer)[0] = 0x1;
-
- if (len >= 4){
- /* set a byte in the bitmap to guide your fuzzer */
- ((uint8_t*)trace_buffer)[0] = 0x1;
- if (payload_buffer->data[0] == '!'){
- ((uint8_t*)trace_buffer)[1] = 0x1;
- if (payload_buffer->data[1] == 'N'){
- ((uint8_t*)trace_buffer)[2] = 0x1;
- if (payload_buffer->data[2] == 'Y'){
- ((uint8_t*)trace_buffer)[3] = 0x1;
- if (payload_buffer->data[3] == 'X'){
- ((uint8_t*)trace_buffer)[4] = 0x1;
- /* Notifiy the hypervisor and the fuzzer that a "crash" has occured. Also a string is passed by this hypercall (this is currently not supported by AFL++-Nyx) */
- kAFL_hypercall(HYPERCALL_KAFL_PANIC_EXTENDED, (uintptr_t)"Something went wrong\n");
- }
- }
- }
- }
- }
- /* this hypercall is used to notify the hypervisor and the fuzzer that a single fuzzing "execution" has finished.
- * If the reload-mode is enabled, we will jump back to our root snapshot.
- * Otherwise, the hypervisor passes control back to the guest once the bitmap buffer has been "processed" by the fuzzer.
- */
- kAFL_hypercall(HYPERCALL_KAFL_RELEASE, 0);
-
- /* This shouldn't happen if you have enabled the reload mode */
- hprintf("This should never happen :)\n");
- }
-
-
- return 0;
+ uint32_t len = payload_buffer->size;
+
+ /* set a byte to make AFL++ happy (otherwise the fuzzer might refuse to
+ * start fuzzing at all) */
+ ((uint8_t *)trace_buffer)[0] = 0x1;
+
+ if (len >= 4) {
+
+ /* set a byte in the bitmap to guide your fuzzer */
+ ((uint8_t *)trace_buffer)[0] = 0x1;
+ if (payload_buffer->data[0] == '!') {
+
+ ((uint8_t *)trace_buffer)[1] = 0x1;
+ if (payload_buffer->data[1] == 'N') {
+
+ ((uint8_t *)trace_buffer)[2] = 0x1;
+ if (payload_buffer->data[2] == 'Y') {
+
+ ((uint8_t *)trace_buffer)[3] = 0x1;
+ if (payload_buffer->data[3] == 'X') {
+
+ ((uint8_t *)trace_buffer)[4] = 0x1;
+ /* Notifiy the hypervisor and the fuzzer that a "crash" has
+ * occured. Also a string is passed by this hypercall (this is
+ * currently not supported by AFL++-Nyx) */
+ kAFL_hypercall(HYPERCALL_KAFL_PANIC_EXTENDED,
+ (uintptr_t) "Something went wrong\n");
+
+ }
+
+ }
+
+ }
+
+ }
+
+ }
+
+ /* this hypercall is used to notify the hypervisor and the fuzzer that a
+ * single fuzzing "execution" has finished. If the reload-mode is enabled,
+ * we will jump back to our root snapshot. Otherwise, the hypervisor passes
+ * control back to the guest once the bitmap buffer has been "processed" by
+ * the fuzzer.
+ */
+ kAFL_hypercall(HYPERCALL_KAFL_RELEASE, 0);
+
+ /* This shouldn't happen if you have enabled the reload mode */
+ hprintf("This should never happen :)\n");
+
+ }
+
+ return 0;
+
}
+
diff --git a/nyx_mode/libnyx b/nyx_mode/libnyx
index ecbcb2d7234fef0b5e1db8ca6019e6137ee0582d..2e45754e271463f446c31a6f467231d8657910e8 160000
--- a/nyx_mode/libnyx
+++ b/nyx_mode/libnyx
@@ -1 +1 @@
-Subproject commit ecbcb2d7234fef0b5e1db8ca6019e6137ee0582d
+Subproject commit 2e45754e271463f446c31a6f467231d8657910e8
diff --git a/nyx_mode/packer b/nyx_mode/packer
index f91742ce6c51eee133b5675edd68f39202785db1..76100c52db96429350693a6c7284c5c6cbcb6b08 160000
--- a/nyx_mode/packer
+++ b/nyx_mode/packer
@@ -1 +1 @@
-Subproject commit f91742ce6c51eee133b5675edd68f39202785db1
+Subproject commit 76100c52db96429350693a6c7284c5c6cbcb6b08
diff --git a/nyx_mode/update_ref.sh b/nyx_mode/update_ref.sh
index 3e94a42bfd243854a74322c158d3103af05c63d3..898a803fc15e9433a12958b9128b9afd7dea27ca 100755
--- a/nyx_mode/update_ref.sh
+++ b/nyx_mode/update_ref.sh
@@ -71,7 +71,7 @@ echo "$NEW_VERSION" > "$UC_VERSION_FILE"
echo "Done. New XXX version is $NEW_VERSION."
-UC_VERSION_FILE='./QEMU_NXY_VERSION'
+UC_VERSION_FILE='./QEMU_NYX_VERSION'
NEW_VERSION=""
cd ./QEMU-Nyx || exit 1
diff --git a/qemu_mode/README.md b/qemu_mode/README.md
index a045ef4fec1c22e0a3fe407bb128b4121ded6cd0..3ebfc54c39bb8c914236e84cda3d5c739cd2564a 100644
--- a/qemu_mode/README.md
+++ b/qemu_mode/README.md
@@ -135,7 +135,7 @@ Recommended, but not as good as CMPLOG mode (see below).
## 8) CMPLOG mode
-Another new feature is CMPLOG, which is based on the redqueen project. Here all
+Another new feature is CMPLOG, which is based on the Redqueen project. Here all
immediates in CMP instructions are learned and put into a dynamic dictionary and
applied to all locations in the input that reached that CMP, trying to solve and
pass it. This is a very effective feature and it is available for x86, x86_64,
diff --git a/qemu_mode/libqasan/libqasan.c b/qemu_mode/libqasan/libqasan.c
index 13e48c75f0bb60209c32de38f5bc14071a5281b9..f4d590bd1a6a506863df778add54b5426d462faa 100644
--- a/qemu_mode/libqasan/libqasan.c
+++ b/qemu_mode/libqasan/libqasan.c
@@ -72,8 +72,6 @@ __attribute__((constructor)) void __libqasan_init() {
if (getenv("AFL_INST_LIBS") || getenv("QASAN_HOTPACH")) __libqasan_hotpatch();
- if (getenv("AFL_INST_LIBS") || getenv("QASAN_HOTPACH")) __libqasan_hotpatch();
-
#ifdef DEBUG
__qasan_debug = getenv("QASAN_DEBUG") != NULL;
#endif
diff --git a/src/README.md b/src/README.md
index 35af6ab9660ccd11443e52c71f08d290918d0d9c..3f33228039dd43deabdb1678c6f6bf816a46895e 100644
--- a/src/README.md
+++ b/src/README.md
@@ -18,7 +18,7 @@ Quick explanation about the files here:
- `afl-fuzz-performance.c` - hash64 and rand functions
- `afl-fuzz-python.c` - afl-fuzz the python mutator extension
- `afl-fuzz-queue.c` - afl-fuzz handling the queue
-- `afl-fuzz-redqueen.c` - afl-fuzz redqueen implemention
+- `afl-fuzz-redqueen.c` - afl-fuzz redqueen implementation
- `afl-fuzz-run.c` - afl-fuzz running the target
- `afl-fuzz-state.c` - afl-fuzz state and globals
- `afl-fuzz-stats.c` - afl-fuzz writing the statistics file
diff --git a/src/afl-cc.c b/src/afl-cc.c
index 974b1d2a177163ac41a384bfec6c60c72d88e801..9197c74b91d5ffd12033522e901755d8d757e7bd 100644
--- a/src/afl-cc.c
+++ b/src/afl-cc.c
@@ -767,15 +767,13 @@ static void edit_params(u32 argc, char **argv, char **envp) {
u8 *afllib = find_object("libAFLDriver.a", argv[0]);
if (!be_quiet)
- WARNF(
- "Found erroneous '-fsanitize=fuzzer', trying to replace with "
- "libAFLDriver.a");
+ OKF("Found '-fsanitize=fuzzer', replacing with libAFLDriver.a");
if (!afllib) {
WARNF(
- "Cannot find 'libAFLDriver.a' to replace a wrong "
- "'-fsanitize=fuzzer' in the flags - this will fail!");
+ "Cannot find 'libAFLDriver.a' to replace '-fsanitize=fuzzer' in "
+ "the flags - this will fail!");
} else {
diff --git a/src/afl-forkserver.c b/src/afl-forkserver.c
index eebbb7c8f56f2b0da6bfe63d1482c46d1d6e5c7d..ce554170ef6683306b429de753e6f20a188d59f6 100644
--- a/src/afl-forkserver.c
+++ b/src/afl-forkserver.c
@@ -405,24 +405,34 @@ void afl_fsrv_start(afl_forkserver_t *fsrv, char **argv,
}
- if (fsrv->nyx_parent) {
+ if (fsrv->nyx_standalone) {
fsrv->nyx_runner = fsrv->nyx_handlers->nyx_new(
- fsrv->target_path, x, fsrv->nyx_id, fsrv->nyx_bind_cpu_id,
- !fsrv->nyx_standalone);
+ fsrv->target_path, x, fsrv->nyx_bind_cpu_id, MAX_FILE, true);
} else {
- fsrv->nyx_runner = fsrv->nyx_handlers->nyx_new(
- fsrv->target_path, x, fsrv->nyx_id, fsrv->nyx_bind_cpu_id, true);
+ if (fsrv->nyx_parent) {
+
+ fsrv->nyx_runner = fsrv->nyx_handlers->nyx_new_parent(
+ fsrv->target_path, x, fsrv->nyx_bind_cpu_id, MAX_FILE, true);
+
+ } else {
+
+ fsrv->nyx_runner = fsrv->nyx_handlers->nyx_new_child(
+ fsrv->target_path, x, fsrv->nyx_bind_cpu_id, fsrv->nyx_id);
+
+ }
}
+ ck_free(x);
+
if (fsrv->nyx_runner == NULL) { FATAL("Something went wrong ..."); }
u32 tmp_map_size =
fsrv->nyx_handlers->nyx_get_bitmap_buffer_size(fsrv->nyx_runner);
- fsrv->real_map_size = fsrv->map_size;
+ fsrv->real_map_size = tmp_map_size;
fsrv->map_size = (((tmp_map_size + 63) >> 6) << 6);
if (!be_quiet) { ACTF("Target map size: %u", fsrv->real_map_size); }
@@ -456,6 +466,71 @@ void afl_fsrv_start(afl_forkserver_t *fsrv, char **argv,
}
+ /* autodict in Nyx mode */
+ if (!ignore_autodict) {
+
+ x = alloc_printf("%s/workdir/dump/afl_autodict.txt", fsrv->out_dir_path);
+ int nyx_autodict_fd = open(x, O_RDONLY);
+ ck_free(x);
+
+ if (nyx_autodict_fd >= 0) {
+
+ struct stat st;
+ if (fstat(nyx_autodict_fd, &st) >= 0) {
+
+ u32 f_len = st.st_size;
+ u8 *dict = ck_alloc(f_len);
+ if (dict == NULL) {
+
+ FATAL("Could not allocate %u bytes of autodictionary memory",
+ f_len);
+
+ }
+
+ u32 offset = 0, count = 0;
+ u32 len = f_len;
+
+ while (len != 0) {
+
+ rlen = read(nyx_autodict_fd, dict + offset, len);
+ if (rlen > 0) {
+
+ len -= rlen;
+ offset += rlen;
+
+ } else {
+
+ FATAL(
+ "Reading autodictionary fail at position %u with %u bytes "
+ "left.",
+ offset, len);
+
+ }
+
+ }
+
+ offset = 0;
+ while (offset < (u32)f_len &&
+ (u8)dict[offset] + offset < (u32)f_len) {
+
+ fsrv->add_extra_func(fsrv->afl_ptr, dict + offset + 1,
+ (u8)dict[offset]);
+ offset += (1 + dict[offset]);
+ count++;
+
+ }
+
+ if (!be_quiet) { ACTF("Loaded %u autodictionary entries", count); }
+ ck_free(dict);
+
+ }
+
+ close(nyx_autodict_fd);
+
+ }
+
+ }
+
return;
}
diff --git a/src/afl-fuzz.c b/src/afl-fuzz.c
index 1edf82f4df19ebe24e52f9c68810773af0cb58fb..a96dee97f7360282d4858ee832d570aa6ce54a85 100644
--- a/src/afl-fuzz.c
+++ b/src/afl-fuzz.c
@@ -46,18 +46,34 @@ extern u64 time_spent_working;
static void at_exit() {
- s32 i, pid1 = 0, pid2 = 0;
+ s32 i, pid1 = 0, pid2 = 0, pgrp = -1;
char *list[4] = {SHM_ENV_VAR, SHM_FUZZ_ENV_VAR, CMPLOG_SHM_ENV_VAR, NULL};
char *ptr;
- ptr = getenv(CPU_AFFINITY_ENV_VAR);
- if (ptr && *ptr) unlink(ptr);
+ ptr = getenv("__AFL_TARGET_PID2");
+ if (ptr && *ptr && (pid2 = atoi(ptr)) > 0) {
+
+#if defined(__linux__)
+ pgrp = getpgid(pid2);
+#endif
+ if (pgrp > 0) { killpg(pgrp, SIGTERM); }
+ kill(pid2, SIGTERM);
+
+ }
ptr = getenv("__AFL_TARGET_PID1");
- if (ptr && *ptr && (pid1 = atoi(ptr)) > 0) kill(pid1, SIGTERM);
+ if (ptr && *ptr && (pid1 = atoi(ptr)) > 0) {
- ptr = getenv("__AFL_TARGET_PID2");
- if (ptr && *ptr && (pid2 = atoi(ptr)) > 0) kill(pid2, SIGTERM);
+#if defined(__linux__)
+ pgrp = getpgid(pid1);
+#endif
+ if (pgrp > 0) { killpg(pgrp, SIGTERM); }
+ kill(pid1, SIGTERM);
+
+ }
+
+ ptr = getenv(CPU_AFFINITY_ENV_VAR);
+ if (ptr && *ptr) unlink(ptr);
i = 0;
while (list[i] != NULL) {
@@ -85,8 +101,25 @@ static void at_exit() {
/* AFL_KILL_SIGNAL should already be a valid int at this point */
if ((ptr = getenv("AFL_KILL_SIGNAL"))) { kill_signal = atoi(ptr); }
- if (pid1 > 0) { kill(pid1, kill_signal); }
- if (pid2 > 0) { kill(pid2, kill_signal); }
+ if (pid1 > 0) {
+
+#if defined(__linux__)
+ pgrp = getpgid(pid1);
+#endif
+ if (pgrp > 0) { killpg(pgrp, kill_signal); }
+ kill(pid1, kill_signal);
+
+ }
+
+ if (pid2 > 0) {
+
+#if defined(__linux__)
+ pgrp = getpgid(pid1);
+#endif
+ if (pgrp > 0) { killpg(pgrp, kill_signal); }
+ kill(pid2, kill_signal);
+
+ }
}
@@ -121,8 +154,7 @@ static void usage(u8 *argv0, int more_help) {
#if defined(__linux__)
" -Q - use binary-only instrumentation (QEMU mode)\n"
" -U - use unicorn-based instrumentation (Unicorn mode)\n"
- " -W - use qemu-based instrumentation with Wine (Wine "
- "mode)\n"
+ " -W - use qemu-based instrumentation with Wine (Wine mode)\n"
#endif
#if defined(__linux__)
" -X - use VM fuzzing (NYX mode - standalone mode)\n"
@@ -173,8 +205,8 @@ static void usage(u8 *argv0, int more_help) {
" -T text - text banner to show on the screen\n"
" -I command - execute this command/script when a new crash is "
"found\n"
- //" -B bitmap.txt - mutate a specific test case, use the out/fuzz_bitmap
- //" "file\n"
+ //" -B bitmap.txt - mutate a specific test case, use the
+ //out/default/fuzz_bitmap file\n"
" -C - crash exploration mode (the peruvian rabbit thing)\n"
" -b cpu_id - bind the fuzzing process to the specified CPU core "
"(0-...)\n"
@@ -283,7 +315,7 @@ static void usage(u8 *argv0, int more_help) {
SAYF("Compiled with %s module support, see docs/custom_mutator.md\n",
(char *)PYTHON_VERSION);
#else
- SAYF("Compiled without python module support.\n");
+ SAYF("Compiled without Python module support.\n");
#endif
#ifdef AFL_PERSISTENT_RECORD
@@ -404,6 +436,12 @@ nyx_plugin_handler_t *afl_load_libnyx_plugin(u8 *libnyx_binary) {
plugin->nyx_new = dlsym(handle, "nyx_new");
if (plugin->nyx_new == NULL) { goto fail; }
+ plugin->nyx_new_parent = dlsym(handle, "nyx_new_parent");
+ if (plugin->nyx_new_parent == NULL) { goto fail; }
+
+ plugin->nyx_new_child = dlsym(handle, "nyx_new_child");
+ if (plugin->nyx_new_child == NULL) { goto fail; }
+
plugin->nyx_shutdown = dlsym(handle, "nyx_shutdown");
if (plugin->nyx_shutdown == NULL) { goto fail; }
@@ -738,6 +776,7 @@ int main(int argc, char **argv_orig, char **envp) {
case 'f': /* target file */
if (afl->fsrv.out_file) { FATAL("Multiple -f options not supported"); }
+
afl->fsrv.out_file = ck_strdup(optarg);
afl->fsrv.use_stdin = 0;
break;
@@ -917,6 +956,7 @@ int main(int argc, char **argv_orig, char **envp) {
case 'Y': /* NYX distributed mode */
if (afl->fsrv.nyx_mode) { FATAL("Multiple -Y options not supported"); }
+
afl->fsrv.nyx_mode = 1;
break;
@@ -960,6 +1000,7 @@ int main(int argc, char **argv_orig, char **envp) {
case 'Q': /* QEMU mode */
if (afl->fsrv.qemu_mode) { FATAL("Multiple -Q options not supported"); }
+
afl->fsrv.qemu_mode = 1;
if (!mem_limit_given) { afl->fsrv.mem_limit = MEM_LIMIT_QEMU; }
@@ -1070,6 +1111,7 @@ int main(int argc, char **argv_orig, char **envp) {
case 'L': { /* MOpt mode */
if (afl->limit_time_sig) { FATAL("Multiple -L options not supported"); }
+
afl->havoc_max_mult = HAVOC_MAX_MULT_MOPT;
if (sscanf(optarg, "%d", &afl->limit_time_puppet) < 1) {
@@ -1270,8 +1312,7 @@ int main(int argc, char **argv_orig, char **envp) {
if (afl->fsrv.nyx_mode) {
OKF("afl++ Nyx mode is enabled (developed and mainted by Sergej Schumilo)");
- OKF("Nyx is open source, get it at "
- "https://github.com/Nyx-Fuzz");
+ OKF("Nyx is open source, get it at https://github.com/Nyx-Fuzz");
}
@@ -1341,6 +1382,7 @@ int main(int argc, char **argv_orig, char **envp) {
}
+ afl->fsrv.nyx_parent = true;
afl->fsrv.nyx_id = 0;
}
diff --git a/test/test-unicorn-mode.sh b/test/test-unicorn-mode.sh
index e197e226484955f9bed3370f881ee36c99556b33..182958d6ad7b63d1b8e890b912fd32b4f39279a0 100755
--- a/test/test-unicorn-mode.sh
+++ b/test/test-unicorn-mode.sh
@@ -4,7 +4,7 @@
$ECHO "$BLUE[*] Testing: unicorn_mode"
test -d ../unicorn_mode/unicornafl -a -e ../unicorn_mode/unicornafl/samples/shellcode && {
- test -e ../unicorn_mode/samples/simple/simple_target.bin -a -e ../unicorn_mode/samples/compcov_x64/compcov_target.bin && {
+ test -e ../unicorn_mode/samples/python_simple/simple_target.bin -a -e ../unicorn_mode/samples/compcov_x64/compcov_target.bin && {
{
# We want to see python errors etc. in logs, in case something doesn't work
export AFL_DEBUG_CHILD=1
@@ -61,7 +61,7 @@ test -d ../unicorn_mode/unicornafl -a -e ../unicorn_mode/unicornafl/samples/shel
{
$ECHO "$GREY[*] running afl-fuzz for unicorn_mode in python, this will take approx 25 seconds"
{
- ../afl-fuzz -m ${MEM_LIMIT} -V25 -U -i in -o out -d -- "$PY" ../unicorn_mode/samples/simple/simple_test_harness.py @@ >>errors 2>&1
+ ../afl-fuzz -m ${MEM_LIMIT} -V25 -U -i in -o out -d -- "$PY" ../unicorn_mode/samples/python_simple/simple_test_harness.py @@ >>errors 2>&1
} >>errors 2>&1
test -n "$( ls out/default/queue/id:000002* 2>/dev/null )" && {
$ECHO "$GREEN[+] afl-fuzz is working correctly with unicorn_mode"
diff --git a/unicorn_mode/README.md b/unicorn_mode/README.md
index 0f28cf9657a39bf148872c1319eb5de8894b821f..ce87a2e9edfcc857e967ff3994d166c6fa65af14 100644
--- a/unicorn_mode/README.md
+++ b/unicorn_mode/README.md
@@ -1,74 +1,81 @@
# Unicorn-based binary-only instrumentation for afl-fuzz
-The idea and much of the original implementation comes from Nathan Voss <njvoss299@gmail.com>.
+The idea and much of the original implementation comes from Nathan Voss
+<njvoss299@gmail.com>.
The port to AFL++ is by Dominik Maier <mail@dmnk.co>.
-The CompareCoverage and NeverZero counters features are by Andrea Fioraldi <andreafioraldi@gmail.com>.
+The CompareCoverage and NeverZero counters features are by Andrea Fioraldi
+<andreafioraldi@gmail.com>.
## 1) Introduction
-The code in ./unicorn_mode allows you to build the
-(Unicorn Engine)[https://github.com/unicorn-engine/unicorn] with AFL++ support.
-This means, you can run anything that can be emulated in unicorn and obtain instrumentation
-output for black-box, closed-source binary code snippets. This mechanism
-can be then used by afl-fuzz to stress-test targets that couldn't be built
-with afl-cc or used in QEMU mode.
+The code in [unicorn_mode/](./) allows you to build the
+[Unicorn Engine](https://github.com/unicorn-engine/unicorn) with AFL++ support.
+This means, you can run anything that can be emulated in unicorn and obtain
+instrumentation output for black-box, closed-source binary code snippets. This
+mechanism can be then used by afl-fuzz to stress-test targets that couldn't be
+built with afl-cc or used in QEMU mode.
-There is a significant performance penalty compared to native AFL,
-but at least we're able to use AFL++ on these binaries, right?
+There is a significant performance penalty compared to native AFL, but at least
+we're able to use AFL++ on these binaries, right?
## 2) How to use
-First, you will need a working harness for your target in unicorn, using Python, C, or Rust.
-For some pointers for more advanced emulation, take a look at [BaseSAFE](https://github.com/fgsect/BaseSAFE) and [Qiling](https://github.com/qilingframework/qiling).
+First, you will need a working harness for your target in unicorn, using Python,
+C, or Rust.
-### Building AFL++'s Unicorn Mode
+For some pointers for more advanced emulation, take a look at
+[BaseSAFE](https://github.com/fgsect/BaseSAFE) and
+[Qiling](https://github.com/qilingframework/qiling).
-First, make AFL++ as usual.
-Once that completes successfully you need to build and add in the Unicorn Mode
-features:
+### Building AFL++'s Unicorn mode
+
+First, make AFL++ as usual. Once that completes successfully, you need to build
+and add in the Unicorn mode features:
```
cd unicorn_mode
./build_unicorn_support.sh
```
-NOTE: This script checks out a Unicorn Engine fork as submodule that has been tested
-and is stable-ish, based on the unicorn engine `next` branch.
-
-Building Unicorn will take a little bit (~5-10 minutes). Once it completes
-it automatically compiles a sample application and verifies that it works.
-
-### Fuzzing with Unicorn Mode
-
-To use unicorn-mode effectively you need to prepare the following:
-
- * Relevant binary code to be fuzzed
- * Knowledge of the memory map and good starting state
- * Folder containing sample inputs to start fuzzing with
- + Same ideas as any other AFL++ inputs
- + Quality/speed of results will depend greatly on the quality of starting
- samples
- + See AFL's guidance on how to create a sample corpus
- * Unicornafl-based test harness in Rust, C, or Python, which:
- + Adds memory map regions
- + Loads binary code into memory
- + Calls uc.afl_fuzz() / uc.afl_start_forkserver
- + Loads and verifies data to fuzz from a command-line specified file
- + AFL++ will provide mutated inputs by changing the file passed to
- the test harness
- + Presumably the data to be fuzzed is at a fixed buffer address
- + If input constraints (size, invalid bytes, etc.) are known they
- should be checked in the place_input handler. If a constraint
- fails, just return false from the handler. AFL++ will treat the input as 'uninteresting' and move on.
- + Sets up registers and memory state for beginning of test
- + Emulates the interesting code from beginning to end
- + If a crash is detected, the test harness must 'crash' by
- throwing a signal (SIGSEGV, SIGKILL, SIGABORT, etc.), or indicate a crash in the crash validation callback.
-
-Once you have all those things ready to go you just need to run afl-fuzz in
-'unicorn-mode' by passing in the '-U' flag:
+NOTE: This script checks out a Unicorn Engine fork as submodule that has been
+tested and is stable-ish, based on the unicorn engine `next` branch.
+
+Building Unicorn will take a little bit (~5-10 minutes). Once it completes, it
+automatically compiles a sample application and verifies that it works.
+
+### Fuzzing with Unicorn mode
+
+To use unicorn-mode effectively, you need to prepare the following:
+
+* Relevant binary code to be fuzzed
+* Knowledge of the memory map and good starting state
+* Folder containing sample inputs to start fuzzing with
+ * Same ideas as any other AFL++ inputs
+ * Quality/speed of results will depend greatly on the quality of starting
+ samples
+ * See AFL's guidance on how to create a sample corpus
+* Unicornafl-based test harness in Rust, C, or Python, which:
+ * Adds memory map regions
+ * Loads binary code into memory
+ * Calls uc.afl_fuzz() / uc.afl_start_forkserver
+ * Loads and verifies data to fuzz from a command-line specified file
+ * AFL++ will provide mutated inputs by changing the file passed to the
+ test harness
+ * Presumably the data to be fuzzed is at a fixed buffer address
+ * If input constraints (size, invalid bytes, etc.) are known, they
+ should be checked in the place_input handler. If a constraint fails,
+ just return false from the handler. AFL++ will treat the input as
+ 'uninteresting' and move on.
+ * Sets up registers and memory state to start testing
+ * Emulates the interesting code from beginning to end
+ * If a crash is detected, the test harness must 'crash' by throwing a signal
+ (SIGSEGV, SIGKILL, SIGABORT, etc.), or indicate a crash in the crash
+ validation callback.
+
+Once you have all those things ready to go, you just need to run afl-fuzz in
+`unicorn-mode` by passing in the `-U` flag:
```
afl-fuzz -U -m none -i /path/to/inputs -o /path/to/results -- ./test_harness @@
@@ -78,39 +85,45 @@ The normal afl-fuzz command line format applies to everything here. Refer to
AFL's main documentation for more info about how to use afl-fuzz effectively.
For a much clearer vision of what all of this looks like, refer to the sample
-provided in the 'unicorn_mode/samples' directory. There is also a blog post that
+provided in the [samples/](./samples/) directory. There is also a blog post that
uses slightly older concepts, but describes the general ideas, at:
[https://medium.com/@njvoss299/afl-unicorn-fuzzing-arbitrary-binary-code-563ca28936bf](https://medium.com/@njvoss299/afl-unicorn-fuzzing-arbitrary-binary-code-563ca28936bf)
-The ['helper_scripts'](./helper_scripts) directory also contains several helper scripts that allow you
-to dump context from a running process, load it, and hook heap allocations. For details
-on how to use this check out the follow-up blog post to the one linked above.
+The [helper_scripts/](./helper_scripts/) directory also contains several helper
+scripts that allow you to dump context from a running process, load it, and hook
+heap allocations. For details on how to use this, check out the follow-up blog
+post to the one linked above:
+
+[https://hackernoon.com/afl-unicorn-part-2-fuzzing-the-unfuzzable-bea8de3540a5](https://hackernoon.com/afl-unicorn-part-2-fuzzing-the-unfuzzable-bea8de3540a5)
-A example use of AFL-Unicorn mode is discussed in the paper Unicorefuzz:
+An example use of AFL-Unicorn mode is discussed in the paper Unicorefuzz:
[https://www.usenix.org/conference/woot19/presentation/maier](https://www.usenix.org/conference/woot19/presentation/maier)
## 3) Options
-As for the QEMU-based instrumentation, unicornafl comes with a sub-instruction based instrumentation similar in purpose to laf-intel.
+As for the QEMU-based instrumentation, unicornafl comes with a sub-instruction
+based instrumentation similar in purpose to laf-intel.
-The options that enable Unicorn CompareCoverage are the same used for QEMU.
-This will split up each multi-byte compare to give feedback for each correct byte.
-`AFL_COMPCOV_LEVEL=1` is to instrument comparisons with only immediate values.
+The options that enable Unicorn CompareCoverage are the same used for QEMU. This
+will split up each multi-byte compare to give feedback for each correct byte:
-`AFL_COMPCOV_LEVEL=2` instruments all comparison instructions.
+* `AFL_COMPCOV_LEVEL=1` to instrument comparisons with only immediate values.
+* `AFL_COMPCOV_LEVEL=2` to instrument all comparison instructions.
-Comparison instructions are currently instrumented only for the x86, x86_64 and ARM targets.
+Comparison instructions are currently instrumented only for the x86, x86_64, and
+ARM targets.
## 4) Gotchas, feedback, bugs
-Running the build script builds Unicornafl and its python bindings and installs
-them on your system.
-This installation will leave any existing Unicorn installations untouched.
-If you want to use unicornafl instead of unicorn in a script,
-replace all `unicorn` imports with `unicornafl` inputs, everything else should "just work".
-If you use 3rd party code depending on unicorn, you can use unicornafl monkeypatching:
-Before importing anything that depends on unicorn, do:
+Running the build script builds unicornafl and its Python bindings and installs
+them on your system. This installation will leave any existing Unicorn
+installations untouched.
+
+If you want to use unicornafl instead of unicorn in a script, replace all
+`unicorn` imports with `unicornafl` inputs, everything else should "just work".
+If you use 3rd party code depending on unicorn, you can use unicornafl
+monkeypatching. Before importing anything that depends on unicorn, do:
```python
import unicornafl
@@ -119,20 +132,30 @@ unicornafl.monkeypatch()
This will replace all unicorn imports with unicornafl inputs.
-5) Examples
+## 5) Examples
+
+Apart from reading the documentation in `afl.c` and the Python bindings of
+unicornafl, the best documentation are the [samples/](./samples).
-Apart from reading the documentation in `afl.c` and the python bindings of unicornafl, the best documentation are the [samples/](./samples).
The following examples exist at the time of writing:
-- c: A simple example how to use the c bindings
-- compcov_x64: A python example that uses compcov to traverse hard-to-reach blocks
-- persistent: A c example using persistent mode for maximum speed, and resetting the target state between each iteration
-- simple: A simple python example
-- speedtest/c: The c harness for an example target, used to compare c, python, and rust bindings and fix speed issues
-- speedtest/python: Fuzzing the same target in python
-- speedtest/rust: Fuzzing the same target using a rust harness
-
-Usually, the place to look at is the `harness` in each folder. The source code in each harness is pretty well documented.
-Most harnesses also have the `afl-fuzz` commandline, or even offer a `make fuzz` Makefile target.
-Targets in these folders, if x86, can usually be made using `make target` in each folder or get shipped pre-built (plus their source).
-Especially take a look at the [speedtest documentation](./samples/speedtest/README.md) to see how the languages compare.
\ No newline at end of file
+- c: A simple example on how to use the C bindings
+- compcov_x64: A Python example that uses compcov to traverse hard-to-reach
+ blocks
+- persistent: A C example using persistent mode for maximum speed, and resetting
+ the target state between each iteration
+- simple: A simple Python example
+- speedtest/c: The C harness for an example target, used to compare C, Python,
+ and Rust bindings and fix speed issues
+- speedtest/python: Fuzzing the same target in Python
+- speedtest/rust: Fuzzing the same target using a Rust harness
+
+Usually, the place to look at is the `harness` in each folder. The source code
+in each harness is pretty well documented. Most harnesses also have the
+`afl-fuzz` commandline, or even offer a `make fuzz` Makefile target. Targets in
+these folders, if x86, can usually be made using `make target` in each folder or
+get shipped pre-built (plus their source).
+
+Especially take a look at the
+[speedtest documentation](./samples/speedtest/README.md) to see how the
+languages compare.
\ No newline at end of file
diff --git a/unicorn_mode/UNICORNAFL_VERSION b/unicorn_mode/UNICORNAFL_VERSION
index 8b9c9fc092f96bc63f41a06845ade6909cc45bb2..4697a49295b92fdbf770cc1f866317dd0dd2e5b3 100644
--- a/unicorn_mode/UNICORNAFL_VERSION
+++ b/unicorn_mode/UNICORNAFL_VERSION
@@ -1 +1 @@
-7b0c61f25042ebed910b88da2ca42778b858b852
+46879845
diff --git a/unicorn_mode/build_unicorn_support.sh b/unicorn_mode/build_unicorn_support.sh
index 340ac77c7fbfb813f18eb5a63373a5a918a37fcb..74f9e1747e78760b3f45257a1b374018f1022307 100755
--- a/unicorn_mode/build_unicorn_support.sh
+++ b/unicorn_mode/build_unicorn_support.sh
@@ -180,8 +180,7 @@ sh -c 'git stash && git stash drop' 1>/dev/null 2>/dev/null
git checkout "$UNICORNAFL_VERSION" || exit 1
echo "[*] making sure afl++ header files match"
-cp "../../include/config.h" "." || exit 1
-cp "../../include/types.h" "." || exit 1
+cp "../../include/config.h" "./include" || exit 1
echo "[*] Configuring Unicorn build..."
@@ -213,7 +212,7 @@ echo "[*] Unicornafl bindings installed successfully."
# Compile the sample, run it, verify that it works!
echo "[*] Testing unicornafl python functionality by running a sample test harness"
-cd ../samples/simple || echo "Cannot cd"
+cd ../samples/python_simple || echo "Cannot cd"
# Run afl-showmap on the sample application. If anything comes out then it must have worked!
unset AFL_INST_RATIO
diff --git a/unicorn_mode/samples/c/Makefile b/unicorn_mode/samples/c/Makefile
index cb491e109aec58cf2dd2d721005ef7690ad3cdb4..fd6dbe77831747ddcc92df5983d9e5458d8bdefa 100644
--- a/unicorn_mode/samples/c/Makefile
+++ b/unicorn_mode/samples/c/Makefile
@@ -4,29 +4,28 @@
.POSIX:
UNAME_S =$(shell uname -s)# GNU make
UNAME_S:sh=uname -s # BSD make
-_UNIQ=_QINU_
-LIBDIR = ../../unicornafl
+UNICORNAFL_LIB = ../../unicornafl/build
+UNICORN_LIB = ../../unicornafl/unicorn/build
BIN_EXT =
AR_EXT = a
# Verbose output?
V ?= 0
-CFLAGS += -Wall -Werror -I../../unicornafl/include
+CFLAGS += -Wall -Werror -I../../unicornafl/unicorn/include -I../../unicornafl/include
-LDFLAGS += -L$(LIBDIR) -lpthread -lm
+LDFLAGS += -L$(UNICORNAFL_LIB) -L$(UNICORN_LIB) -lpthread -lm -lunicornafl -lunicorn -lc++
-_LRT = $(_UNIQ)$(UNAME_S:Linux=)
-__LRT = $(_LRT:$(_UNIQ)=-lrt)
-LRT = $(__LRT:$(_UNIQ)=)
+ifeq ($(UNAME), Linux)
+# do something Linux-y
+LRT = -lrt
+else
+LRT =
+endif
LDFLAGS += $(LRT)
-_CC = $(_UNIQ)$(CROSS)
-__CC = $(_CC:$(_UNIQ)=$(CC))
-MYCC = $(__CC:$(_UNIQ)$(CROSS)=$(CROSS)gcc)
-
.PHONY: all clean
all: harness
@@ -34,14 +33,20 @@ all: harness
clean:
rm -rf *.o harness harness-debug
-harness.o: harness.c ../../unicornafl/include/unicorn/*.h
- ${MYCC} ${CFLAGS} -O3 -c harness.c
+harness.o: harness.c ../../unicornafl/unicorn/include/unicorn/*.h
+ ${CC} ${CFLAGS} -O3 -c harness.c
+
+harness-debug.o: harness.c ../../unicornafl/unicorn/include/unicorn/*.h
+ ${CC} ${CFLAGS} -g -c harness.c -o $@
-harness-debug.o: harness.c ../../unicornafl/include/unicorn/*.h
- ${MYCC} ${CFLAGS} -g -c harness.c -o $@
+../../unicornafl/build/libunicornafl.a:
+ cd ../.. && ./build_unicorn_support.sh
harness: harness.o
- ${MYCC} -L${LIBDIR} harness.o ../../unicornafl/libunicornafl.a $(LDFLAGS) -o $@
+ ${CC} harness.o ../../unicornafl/build/libunicornafl.a $(LDFLAGS) -o $@
debug: harness-debug.o
- ${MYCC} -L${LIBDIR} harness.o ../../unicornafl/libunicornafl.a $(LDFLAGS) -o harness-debug
+ ${CC} harness.o ../../unicornafl/build/libunicornafl.a $(LDFLAGS) -o harness-debug
+
+fuzz: harness
+ DYLD_FALLBACK_LIBRARY_PATH="../../unicornafl/unicorn/build" LD_LIBRARY_PATH="../../unicornafl/unicorn/build" ../../../afl-fuzz -m none -i sample_inputs -o out -- ./harness @@
diff --git a/unicorn_mode/samples/c/harness.c b/unicorn_mode/samples/c/harness.c
index 4bda6e2db7afac49290169903c6d5e14a713f760..30972ce7abf64ffd08e76f8585dcd64404e9b812 100644
--- a/unicorn_mode/samples/c/harness.c
+++ b/unicorn_mode/samples/c/harness.c
@@ -8,7 +8,7 @@
Run under AFL as follows:
- $ cd <afl_path>/unicorn_mode/samples/simple/
+ $ cd <afl_path>/unicorn_mode/samples/c
$ make
$ ../../../afl-fuzz -m none -i sample_inputs -o out -- ./harness @@
*/
@@ -26,6 +26,7 @@
#include <sys/mman.h>
#include <unicorn/unicorn.h>
+#include <unicornafl/unicornafl.h>
// Path to the file containing the binary to emulate
#define BINARY_FILE ("persistent_target_x86_64")
@@ -141,7 +142,7 @@ static void mem_map_checked(uc_engine *uc, uint64_t addr, size_t size, uint32_t
//printf("SIZE %llx, align: %llx\n", size, ALIGNMENT);
uc_err err = uc_mem_map(uc, addr, size, mode);
if (err != UC_ERR_OK) {
- printf("Error mapping %ld bytes at 0x%lx: %s (mode: %d)\n", size, addr, uc_strerror(err), mode);
+ printf("Error mapping %ld bytes at 0x%llx: %s (mode: %d)\n", size, (unsigned long long) addr, uc_strerror(err), (int) mode);
exit(1);
}
}
@@ -184,7 +185,7 @@ int main(int argc, char **argv, char **envp) {
// Map memory.
mem_map_checked(uc, BASE_ADDRESS, len, UC_PROT_ALL);
- printf("Len: %lx\n", len);
+ printf("Len: %lx\n", (unsigned long) len);
fflush(stdout);
// write machine code to be emulated to memory
diff --git a/unicorn_mode/samples/compcov_x64/compcov_test_harness.py b/unicorn_mode/samples/compcov_x64/compcov_test_harness.py
index f0749d1bf47e46f214839ecab47de4a045a0a1d5..52f0a2865950060a1dd79e4075cf3fde868447af 100644
--- a/unicorn_mode/samples/compcov_x64/compcov_test_harness.py
+++ b/unicorn_mode/samples/compcov_x64/compcov_test_harness.py
@@ -10,7 +10,7 @@
Run under AFL as follows:
- $ cd <afl_path>/unicorn_mode/samples/simple/
+ $ cd <afl_path>/unicorn_mode/samples/python_simple
$ AFL_COMPCOV_LEVEL=2 ../../../afl-fuzz -U -m none -i ./sample_inputs -o ./output -- python compcov_test_harness.py @@
"""
diff --git a/unicorn_mode/samples/persistent/Makefile b/unicorn_mode/samples/persistent/Makefile
index 80a475508cb3f200417441a24243006f1c7aa99a..35584416f35362bd3c5d7d685662136c9f7833e4 100644
--- a/unicorn_mode/samples/persistent/Makefile
+++ b/unicorn_mode/samples/persistent/Makefile
@@ -4,29 +4,28 @@
.POSIX:
UNAME_S =$(shell uname -s)# GNU make
UNAME_S:sh=uname -s # BSD make
-_UNIQ=_QINU_
-LIBDIR = ../../unicornafl
+UNICORNAFL_LIB = ../../unicornafl/build
+UNICORN_LIB = ../../unicornafl/unicorn/build
BIN_EXT =
AR_EXT = a
# Verbose output?
V ?= 0
-CFLAGS += -Wall -Werror -I../../unicornafl/include
+CFLAGS += -Wall -Werror -I../../unicornafl/unicorn/include -I../../unicornafl/include
-LDFLAGS += -L$(LIBDIR) -lpthread -lm
+LDFLAGS += -L$(UNICORNAFL_LIB) -L$(UNICORN_LIB) -lpthread -lm -lunicornafl -lunicorn -lc++
-_LRT = $(_UNIQ)$(UNAME_S)
-__LRT = $(_LRT:$(_UNIQ)Linux=-lrt)
-LRT = $(__LRT:$(_UNIQ)$(UNAME_S)=)
+ifeq ($(UNAME), Linux)
+# do something Linux-y
+LRT = -lrt
+else
+LRT =
+endif
LDFLAGS += $(LRT)
-_CC = $(_UNIQ)$(CROSS)
-__CC = $(_CC:$(_UNIQ)=$(CC))
-MYCC = $(__CC:$(_UNIQ)$(CROSS)=$(CROSS)gcc)
-
.PHONY: all clean
all: harness
@@ -34,20 +33,23 @@ all: harness
clean:
rm -rf *.o harness harness-debug
-harness.o: harness.c ../../unicornafl/include/unicorn/*.h
- ${MYCC} ${CFLAGS} -O3 -c harness.c
+harness.o: harness.c ../../unicornafl/unicorn/include/unicorn/*.h
+ ${CC} ${CFLAGS} -O3 -c harness.c
-harness-debug.o: harness.c ../../unicornafl/include/unicorn/*.h
- ${MYCC} ${CFLAGS} -DAFL_DEBUG=1 -g -c harness.c -o $@
+harness-debug.o: harness.c ../../unicornafl/unicorn/include/unicorn/*.h
+ ${CC} ${CFLAGS} -DAFL_DEBUG=1 -g -c harness.c -o $@
harness: harness.o
- ${MYCC} -L${LIBDIR} harness.o ../../unicornafl/libunicornafl.a $(LDFLAGS) -o $@
+ ${CC} harness.o ../../unicornafl/build/libunicornafl.a $(LDFLAGS) -o $@
debug: harness-debug.o
- ${MYCC} -L${LIBDIR} harness-debug.o ../../unicornafl/libunicornafl.a $(LDFLAGS) -o harness-debug
+ ${CC} harness-debug.o ../../unicornafl/build/libunicornafl.a $(LDFLAGS) -o harness-debug
+
+../../unicornafl/build/libunicornafl.a:
+ cd ../.. && ./build_unicorn_support.sh
fuzz: harness
- ../../../afl-fuzz -m none -i sample_inputs -o out -- ./harness @@
+ DYLD_FALLBACK_LIBRARY_PATH="../../unicornafl/unicorn/build" LD_LIBRARY_PATH="../../unicornafl/unicorn/build" ../../../afl-fuzz -m none -i sample_inputs -o out -- ./harness @@
debugmake:
@echo UNAME_S=$(UNAME_S), _LRT=$(_LRT), __LRT=$(__LRT), LRT=$(LRT)
diff --git a/unicorn_mode/samples/persistent/harness.c b/unicorn_mode/samples/persistent/harness.c
index eae3f1fcd86c6a45b878a358dd5b59e144b23286..37b652e076bca73b1f75e4537f06876b1adeb5cd 100644
--- a/unicorn_mode/samples/persistent/harness.c
+++ b/unicorn_mode/samples/persistent/harness.c
@@ -30,6 +30,7 @@
#include <sys/mman.h>
#include <unicorn/unicorn.h>
+#include <unicornafl/unicornafl.h>
// Path to the file containing the binary to emulate
#define BINARY_FILE ("persistent_target_x86_64")
diff --git a/unicorn_mode/samples/simple/COMPILE.md b/unicorn_mode/samples/python_simple/COMPILE.md
similarity index 100%
rename from unicorn_mode/samples/simple/COMPILE.md
rename to unicorn_mode/samples/python_simple/COMPILE.md
diff --git a/unicorn_mode/samples/simple/sample_inputs/sample1.bin b/unicorn_mode/samples/python_simple/sample_inputs/sample1.bin
similarity index 100%
rename from unicorn_mode/samples/simple/sample_inputs/sample1.bin
rename to unicorn_mode/samples/python_simple/sample_inputs/sample1.bin
diff --git a/unicorn_mode/samples/simple/sample_inputs/sample2.bin b/unicorn_mode/samples/python_simple/sample_inputs/sample2.bin
similarity index 100%
rename from unicorn_mode/samples/simple/sample_inputs/sample2.bin
rename to unicorn_mode/samples/python_simple/sample_inputs/sample2.bin
diff --git a/unicorn_mode/samples/simple/sample_inputs/sample3.bin b/unicorn_mode/samples/python_simple/sample_inputs/sample3.bin
similarity index 100%
rename from unicorn_mode/samples/simple/sample_inputs/sample3.bin
rename to unicorn_mode/samples/python_simple/sample_inputs/sample3.bin
diff --git a/unicorn_mode/samples/simple/sample_inputs/sample4.bin b/unicorn_mode/samples/python_simple/sample_inputs/sample4.bin
similarity index 100%
rename from unicorn_mode/samples/simple/sample_inputs/sample4.bin
rename to unicorn_mode/samples/python_simple/sample_inputs/sample4.bin
diff --git a/unicorn_mode/samples/simple/sample_inputs/sample5.bin b/unicorn_mode/samples/python_simple/sample_inputs/sample5.bin
similarity index 100%
rename from unicorn_mode/samples/simple/sample_inputs/sample5.bin
rename to unicorn_mode/samples/python_simple/sample_inputs/sample5.bin
diff --git a/unicorn_mode/samples/simple/simple_target.bin b/unicorn_mode/samples/python_simple/simple_target.bin
similarity index 100%
rename from unicorn_mode/samples/simple/simple_target.bin
rename to unicorn_mode/samples/python_simple/simple_target.bin
diff --git a/unicorn_mode/samples/simple/simple_target.c b/unicorn_mode/samples/python_simple/simple_target.c
similarity index 100%
rename from unicorn_mode/samples/simple/simple_target.c
rename to unicorn_mode/samples/python_simple/simple_target.c
diff --git a/unicorn_mode/samples/simple/simple_test_harness.py b/unicorn_mode/samples/python_simple/simple_test_harness.py
similarity index 96%
rename from unicorn_mode/samples/simple/simple_test_harness.py
rename to unicorn_mode/samples/python_simple/simple_test_harness.py
index cd04ad3ae7dae6d86cd223738cbd183840b95b91..8758192e817c3447b26266d0b1397a507a60e277 100644
--- a/unicorn_mode/samples/simple/simple_test_harness.py
+++ b/unicorn_mode/samples/python_simple/simple_test_harness.py
@@ -10,7 +10,7 @@
Run under AFL as follows:
- $ cd <afl_path>/unicorn_mode/samples/simple/
+ $ cd <afl_path>/unicorn_mode/samples/python_simple
$ ../../../afl-fuzz -U -m none -i ./sample_inputs -o ./output -- python simple_test_harness.py @@
"""
@@ -19,7 +19,7 @@ import os
import signal
from unicornafl import *
-from unicornafl.mips_const import *
+from unicorn.mips_const import *
# Path to the file containing the binary to emulate
BINARY_FILE = os.path.join(
@@ -156,7 +156,7 @@ def main():
uc.mem_write(DATA_ADDRESS, input)
# Start the fuzzer.
- uc.afl_fuzz(args.input_file, place_input_callback, [end_address])
+ uc_afl_fuzz(uc=uc, input_file=args.input_file, place_input_callback=place_input_callback, exits=[end_address])
if __name__ == "__main__":
diff --git a/unicorn_mode/samples/simple/simple_test_harness_alt.py b/unicorn_mode/samples/python_simple/simple_test_harness_alt.py
similarity index 99%
rename from unicorn_mode/samples/simple/simple_test_harness_alt.py
rename to unicorn_mode/samples/python_simple/simple_test_harness_alt.py
index 3249b13d463779362d8c6203dd63cc17682bee8c..5fb3f82fd8cc5a5a9017b30cbcd5c6f9df85242e 100644
--- a/unicorn_mode/samples/simple/simple_test_harness_alt.py
+++ b/unicorn_mode/samples/python_simple/simple_test_harness_alt.py
@@ -13,7 +13,7 @@
Run under AFL as follows:
- $ cd <afl_path>/unicorn_mode/samples/simple/
+ $ cd <afl_path>/unicorn_mode/samples/python_simple
$ ../../../afl-fuzz -U -m none -i ./sample_inputs -o ./output -- python simple_test_harness_alt.py @@
"""
diff --git a/unicorn_mode/samples/speedtest/README.md b/unicorn_mode/samples/speedtest/README.md
index bd5ba8d0dc8cd100ccf5fad79815d1e13e587cf1..f46a57726284797d5fe92f166f39b1a90b4ec95a 100644
--- a/unicorn_mode/samples/speedtest/README.md
+++ b/unicorn_mode/samples/speedtest/README.md
@@ -5,7 +5,11 @@ to show the raw speed of C, Rust, and Python harnesses.
## Compiling...
-Make sure, you built unicornafl first (`../../build_unicorn_support.sh`).
+Make sure you built unicornafl first (`../../build_unicorn_support.sh`).
+Build the target using the provided Makefile.
+This will also run the [./get_offsets.py](./get_offsets.py) script,
+which finds some relevant addresses in the target binary using `objdump`,
+and dumps them to different files.
Then, follow these individual steps:
### Rust
@@ -13,7 +17,7 @@ Then, follow these individual steps:
```bash
cd rust
cargo build --release
-../../../afl-fuzz -i ../sample_inputs -o out -- ./target/release/harness @@
+../../../../afl-fuzz -i ../sample_inputs -o out -U -- ./target/release/harness @@
```
### C
@@ -21,52 +25,16 @@ cargo build --release
```bash
cd c
make
-../../../afl-fuzz -i ../sample_inputs -o out -- ./harness @@
+../../../../afl-fuzz -i ../sample_inputs -o out -U -- ./harness @@
```
### python
```bash
cd python
-../../../afl-fuzz -i ../sample_inputs -o out -U -- python3 ./harness.py @@
+../../../../afl-fuzz -i ../sample_inputs -o out -U -- python3 ./harness.py @@
```
## Results
TODO: add results here.
-
-## Compiling speedtest_target.c
-
-You shouldn't need to compile simple_target.c since a X86_64 binary version is
-pre-built and shipped in this sample folder. This file documents how the binary
-was built in case you want to rebuild it or recompile it for any reason.
-
-The pre-built binary (simple_target_x86_64.bin) was built using -g -O0 in gcc.
-
-Then load the binary and execute the main function directly.
-
-## Addresses for the harness
-
-To find the address (in hex) of main, run:
-
-```bash
-objdump -M intel -D target | grep '<main>:' | cut -d" " -f1
-```
-
-To find all call sites to magicfn, run:
-
-```bash
-objdump -M intel -D target | grep '<magicfn>$' | cut -d":" -f1
-```
-
-For malloc callsites:
-
-```bash
-objdump -M intel -D target | grep '<malloc@plt>$' | cut -d":" -f1
-```
-
-And free callsites:
-
-```bash
-objdump -M intel -D target | grep '<free@plt>$' | cut -d":" -f1
-```
\ No newline at end of file
diff --git a/unicorn_mode/samples/speedtest/c/Makefile b/unicorn_mode/samples/speedtest/c/Makefile
index 46789954006c1fb5fc42bbed793d181ac3df4e9d..d34f49fa18f4afbcecd99c75239200f80c7c8544 100644
--- a/unicorn_mode/samples/speedtest/c/Makefile
+++ b/unicorn_mode/samples/speedtest/c/Makefile
@@ -4,29 +4,28 @@
.POSIX:
UNAME_S =$(shell uname -s)# GNU make
UNAME_S:sh=uname -s # BSD make
-_UNIQ=_QINU_
-LIBDIR = ../../../unicornafl
+UNICORNAFL_LIB = ../../../unicornafl/build
+UNICORN_LIB = ../../../unicornafl/unicorn/build
BIN_EXT =
AR_EXT = a
# Verbose output?
V ?= 0
-CFLAGS += -Wall -Werror -Wextra -Wno-unused-parameter -I../../../unicornafl/include
+CFLAGS += -Wall -I../../../unicornafl/unicorn/include -I../../../unicornafl/include
-LDFLAGS += -L$(LIBDIR) -lpthread -lm
+LDFLAGS += -L$(UNICORNAFL_LIB) -L$(UNICORN_LIB) -lpthread -lm -lunicornafl -lunicorn -lc++
-_LRT = $(_UNIQ)$(UNAME_S:Linux=)
-__LRT = $(_LRT:$(_UNIQ)=-lrt)
-LRT = $(__LRT:$(_UNIQ)=)
+ifeq ($(UNAME), Linux)
+# do something Linux-y
+LRT = -lrt
+else
+LRT =
+endif
LDFLAGS += $(LRT)
-_CC = $(_UNIQ)$(CROSS)
-__CC = $(_CC:$(_UNIQ)=$(CC))
-MYCC = $(__CC:$(_UNIQ)$(CROSS)=$(CROSS)gcc)
-
.PHONY: all clean
all: ../target harness
@@ -38,17 +37,20 @@ afl-fuzz: ../../../../afl-fuzz
clean:
rm -rf *.o harness harness-debug
-harness.o: harness.c ../../../unicornafl/include/unicorn/*.h
- ${MYCC} ${CFLAGS} -O3 -c harness.c -o $@
+../../../unicornafl/build/libunicornafl.a:
+ cd ../../.. && ./build_unicorn_support.sh
+
+harness.o: harness.c ../../../unicornafl/unicorn/include/unicorn/*.h
+ ${CC} ${CFLAGS} -O3 -c harness.c -o $@
-harness-debug.o: harness.c ../../../unicornafl/include/unicorn/*.h
- ${MYCC} ${CFLAGS} -fsanitize=address -g -Og -c harness.c -o $@
+harness-debug.o: harness.c ../../../unicornafl/unicorn/include/unicorn/*.h
+ ${CC} ${CFLAGS} -fsanitize=address -g -Og -c harness.c -o $@
harness: harness.o
- ${MYCC} -L${LIBDIR} harness.o ../../../unicornafl/libunicornafl.a $(LDFLAGS) -o $@
+ ${CC} harness.o $(LDFLAGS) -o $@
harness-debug: harness-debug.o
- ${MYCC} -fsanitize=address -g -Og -L${LIBDIR} harness-debug.o ../../../unicornafl/libunicornafl.a $(LDFLAGS) -o harness-debug
+ ${CC} -fsanitize=address -g -Og harness-debug.o ../../../unicornafl/libunicornafl.a $(LDFLAGS) -o harness-debug
../target:
$(MAKE) -C ..
diff --git a/unicorn_mode/samples/speedtest/c/harness.c b/unicorn_mode/samples/speedtest/c/harness.c
index e8de3d8068622a99e262a134bc70cdcb87977309..184934b965f4f15efcb0e79f17b159310e579bcb 100644
--- a/unicorn_mode/samples/speedtest/c/harness.c
+++ b/unicorn_mode/samples/speedtest/c/harness.c
@@ -8,9 +8,9 @@
Run under AFL as follows:
- $ cd <afl_path>/unicorn_mode/samples/simple/
+ $ cd <afl_path>/unicorn_mode/samples/speedtest/c
$ make
- $ ../../../afl-fuzz -m none -i sample_inputs -o out -- ./harness @@
+ $ ../../../../afl-fuzz -i ../sample_inputs -o out -U -- ./harness @@
*/
// This is not your everyday Unicorn.
@@ -28,6 +28,7 @@
#include <sys/mman.h>
#include <unicorn/unicorn.h>
+#include <unicornafl/unicornafl.h>
// Path to the file containing the binary to emulate
#define BINARY_FILE ("../target")
@@ -124,7 +125,7 @@ static void mem_map_checked(uc_engine *uc, uint64_t addr, size_t size, uint32_t
//printf("SIZE %llx, align: %llx\n", size, ALIGNMENT);
uc_err err = uc_mem_map(uc, addr, size, mode);
if (err != UC_ERR_OK) {
- printf("Error mapping %ld bytes at 0x%lx: %s (mode: %d)\n", size, addr, uc_strerror(err), mode);
+ printf("Error mapping %ld bytes at 0x%llx: %s (mode: %d)\n", (unsigned long) size, (unsigned long long) addr, uc_strerror(err), (int) mode);
exit(1);
}
}
@@ -306,7 +307,7 @@ int main(int argc, char **argv, char **envp) {
exit(-1);
}
uint64_t start_address;
- if(fscanf(f, "%lx", &start_address) == EOF) {
+ if(fscanf(f, "%llx", (unsigned long long) &start_address) == EOF) {
puts("Start address not found in target.offests.main");
exit(-1);
}
diff --git a/unicorn_mode/samples/speedtest/rust/Cargo.toml b/unicorn_mode/samples/speedtest/rust/Cargo.toml
index 9b81be0b2308089e180ea19cefb48ba7e95adddf..766b2f275cf7adeb7e0c099a1fc3ddd8aeb54531 100644
--- a/unicorn_mode/samples/speedtest/rust/Cargo.toml
+++ b/unicorn_mode/samples/speedtest/rust/Cargo.toml
@@ -1,5 +1,5 @@
[package]
-name = "unicornafl_harness"
+name = "harness"
version = "0.1.0"
authors = ["Dominik Maier <domenukk@gmail.com>"]
edition = "2018"
diff --git a/unicorn_mode/unicornafl b/unicorn_mode/unicornafl
index 7b0c61f25042ebed910b88da2ca42778b858b852..468798455a9f9790d2da369a18ed49fda3a64e8c 160000
--- a/unicorn_mode/unicornafl
+++ b/unicorn_mode/unicornafl
@@ -1 +1 @@
-Subproject commit 7b0c61f25042ebed910b88da2ca42778b858b852
+Subproject commit 468798455a9f9790d2da369a18ed49fda3a64e8c
diff --git a/utils/aflpp_driver/aflpp_driver.c b/utils/aflpp_driver/aflpp_driver.c
index ff42f3b950757d64d9b5456608436daf349a6a3f..7289c845e8a3fd8c993a795af256582be96040c4 100644
--- a/utils/aflpp_driver/aflpp_driver.c
+++ b/utils/aflpp_driver/aflpp_driver.c
@@ -45,6 +45,9 @@ $AFL_HOME/afl-fuzz -i IN -o OUT ./a.out
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/mman.h>
+#ifndef __HAIKU__
+ #include <sys/syscall.h>
+#endif
#include "config.h"
#include "types.h"
@@ -62,6 +65,27 @@ extern unsigned char *__afl_fuzz_ptr;
int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size);
__attribute__((weak)) int LLVMFuzzerInitialize(int *argc, char ***argv);
+// Default nop ASan hooks for manual posisoning when not linking the ASan
+// runtime
+// https://github.com/google/sanitizers/wiki/AddressSanitizerManualPoisoning
+__attribute__((weak)) void __asan_poison_memory_region(
+ void const volatile *addr, size_t size) {
+
+ (void)addr;
+ (void)size;
+
+}
+
+__attribute__((weak)) void __asan_unpoison_memory_region(
+ void const volatile *addr, size_t size) {
+
+ (void)addr;
+ (void)size;
+
+}
+
+__attribute__((weak)) void *__asan_region_is_poisoned(void *beg, size_t size);
+
// Notify AFL about persistent mode.
static volatile char AFL_PERSISTENT[] = "##SIG_AFL_PERSISTENT##";
int __afl_persistent_loop(unsigned int);
@@ -175,6 +199,9 @@ static int ExecuteFilesOnyByOne(int argc, char **argv) {
unsigned char *buf = (unsigned char *)malloc(MAX_FILE);
+ __asan_poison_memory_region(buf, MAX_FILE);
+ ssize_t prev_length = 0;
+
for (int i = 1; i < argc; i++) {
int fd = 0;
@@ -183,10 +210,26 @@ static int ExecuteFilesOnyByOne(int argc, char **argv) {
if (fd == -1) { continue; }
- ssize_t length = read(fd, buf, MAX_FILE);
+#ifndef __HAIKU__
+ ssize_t length = syscall(SYS_read, fd, buf, MAX_FILE);
+#else
+ ssize_t length = _kern_read(fd, buf, MAX_FILE);
+#endif // HAIKU
if (length > 0) {
+ if (length < prev_length) {
+
+ __asan_poison_memory_region(buf + length, prev_length - length);
+
+ } else {
+
+ __asan_unpoison_memory_region(buf + prev_length, length - prev_length);
+
+ }
+
+ prev_length = length;
+
printf("Reading %zu bytes from %s\n", length, argv[i]);
LLVMFuzzerTestOneInput(buf, length);
printf("Execution successful.\n");
@@ -208,17 +251,17 @@ int main(int argc, char **argv) {
printf(
"============================== INFO ================================\n"
"This binary is built for afl++.\n"
- "To use with afl-cmin or afl-cmin.bash pass '-' as single command line "
- "option\n"
- "To run the target function on individual input(s) execute this:\n"
+ "To run the target function on individual input(s) execute:\n"
" %s INPUT_FILE1 [INPUT_FILE2 ... ]\n"
- "To fuzz with afl-fuzz execute this:\n"
+ "To fuzz with afl-fuzz execute:\n"
" afl-fuzz [afl-flags] -- %s [-N]\n"
"afl-fuzz will run N iterations before re-spawning the process "
"(default: "
"INT_MAX)\n"
"For stdin input processing, pass '-' as single command line option.\n"
"For file input processing, pass '@@' as single command line option.\n"
+ "To use with afl-cmin or afl-cmin.bash pass '-' as single command line "
+ "option\n"
"===================================================================\n",
argv[0], argv[0]);
@@ -282,31 +325,50 @@ int main(int argc, char **argv) {
// Call LLVMFuzzerTestOneInput here so that coverage caused by initialization
// on the first execution of LLVMFuzzerTestOneInput is ignored.
- LLVMFuzzerTestOneInput(dummy_input, 1);
+ LLVMFuzzerTestOneInput(dummy_input, 4);
- int num_runs = 0;
- while (__afl_persistent_loop(N)) {
+ __asan_poison_memory_region(__afl_fuzz_ptr, MAX_FILE);
+ size_t prev_length = 0;
-#ifdef _DEBUG
- fprintf(stderr, "CLIENT crc: %016llx len: %u\n",
- hash64(__afl_fuzz_ptr, *__afl_fuzz_len, 0xa5b35705),
- *__afl_fuzz_len);
- fprintf(stderr, "RECV:");
- for (int i = 0; i < *__afl_fuzz_len; i++)
- fprintf(stderr, "%02x", __afl_fuzz_ptr[i]);
- fprintf(stderr, "\n");
-#endif
+ // for speed only insert asan functions if the target is linked with asan
+ if (__asan_region_is_poisoned) {
+
+ while (__afl_persistent_loop(N)) {
+
+ size_t length = *__afl_fuzz_len;
+
+ if (likely(length)) {
+
+ if (length < prev_length) {
+
+ __asan_poison_memory_region(__afl_fuzz_ptr + length,
+ prev_length - length);
- if (*__afl_fuzz_len) {
+ } else if (length > prev_length) {
+
+ __asan_unpoison_memory_region(__afl_fuzz_ptr + prev_length,
+ length - prev_length);
+
+ }
+
+ prev_length = length;
+ LLVMFuzzerTestOneInput(__afl_fuzz_ptr, length);
+
+ }
+
+ }
+
+ } else {
+
+ while (__afl_persistent_loop(N)) {
- num_runs++;
LLVMFuzzerTestOneInput(__afl_fuzz_ptr, *__afl_fuzz_len);
}
}
- printf("%s: successfully executed %d input(s)\n", argv[0], num_runs);
+ return 0;
}