aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorvan Hauser <vh@thc.org>2021-01-31 15:04:40 +0100
committervan Hauser <vh@thc.org>2021-01-31 15:04:40 +0100
commit7a861498c27997cd7be01a5650d54cff3b87a02e (patch)
tree5cb3615529165bafaeaae0a49385e3231b2f7364 /src
parent893cd47d9cdbfa44e43d03e7d40a56a0c2ad7936 (diff)
downloadafl++-7a861498c27997cd7be01a5650d54cff3b87a02e.tar.gz
added support for __afl_coverage_interesting
Diffstat (limited to 'src')
-rw-r--r--src/afl-cc.c16
-rw-r--r--src/afl-fuzz.c5
2 files changed, 12 insertions, 9 deletions
diff --git a/src/afl-cc.c b/src/afl-cc.c
index b5dcb632..f513764a 100644
--- a/src/afl-cc.c
+++ b/src/afl-cc.c
@@ -572,7 +572,8 @@ static void edit_params(u32 argc, char **argv, char **envp) {
cc_params[cc_par_cnt++] = "-Wl,--allow-multiple-definition";
- if (instrument_mode == INSTRUMENT_CFG)
+ if (instrument_mode == INSTRUMENT_CFG ||
+ instrument_mode == INSTRUMENT_PCGUARD)
cc_params[cc_par_cnt++] = alloc_printf(
"-Wl,-mllvm=-load=%s/SanitizerCoverageLTO.so", obj_path);
else
@@ -1670,15 +1671,16 @@ int main(int argc, char **argv, char **envp) {
if (compiler_mode == LTO) {
if (instrument_mode == 0 || instrument_mode == INSTRUMENT_LTO ||
- instrument_mode == INSTRUMENT_CFG) {
+ instrument_mode == INSTRUMENT_CFG ||
+ instrument_mode == INSTRUMENT_PCGUARD) {
lto_mode = 1;
- if (!instrument_mode) {
+ // force CFG
+ // if (!instrument_mode) {
- instrument_mode = INSTRUMENT_CFG;
- // ptr = instrument_mode_string[instrument_mode];
-
- }
+ instrument_mode = INSTRUMENT_PCGUARD;
+ // ptr = instrument_mode_string[instrument_mode];
+ // }
} else if (instrument_mode == INSTRUMENT_LTO ||
diff --git a/src/afl-fuzz.c b/src/afl-fuzz.c
index 647a665e..82eff61f 100644
--- a/src/afl-fuzz.c
+++ b/src/afl-fuzz.c
@@ -145,7 +145,8 @@ static void usage(u8 *argv0, int more_help) {
"Other stuff:\n"
" -M/-S id - distributed mode (see docs/parallel_fuzzing.md)\n"
- " -M auto-sets -D, -Z (use -d to disable -D) and no trimming\n"
+ " -M auto-sets -D, -Z (use -d to disable -D) and no "
+ "trimming\n"
" -F path - sync to a foreign fuzzer queue directory (requires "
"-M, can\n"
" be specified up to %u times)\n"
@@ -502,7 +503,7 @@ int main(int argc, char **argv_orig, char **envp) {
afl->sync_id = ck_strdup(optarg);
afl->skip_deterministic = 0; // force deterministic fuzzing
afl->old_seed_selection = 1; // force old queue walking seed selection
- afl->disable_trim = 1; // disable trimming
+ afl->disable_trim = 1; // disable trimming
if ((c = strchr(afl->sync_id, ':'))) {