8000 Merge pull request #2450 from AFLplusplus/dev · AFLplusplus/AFLplusplus@0012f71 · GitHub
[go: up one dir, main page]
Skip to content

Commit 0012f71

Browse files
vanhauser-thcvanhauser-thc
authored
Merge pull request #2450 from AFLplusplus/dev
push to stable
2 parents 1f878f1 + be00ea9 commit 0012f71

14 files changed

+644
-374
lines changed

‎docs/Changelog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
(thanks to @kcwu for raising the issues and providing support!)
1616
- more 64 bit archicture support by @maribu
1717
- afl-cc:
18+
- Added instrumenting hidden edges (approx 5% edges were not instrumented,
19+
LLVM sancov overall misses 8% of edges compared to our implementation)
20+
Note that is is currently only implemented for our PCGUARD plugin, not
21+
LTO, CLASSIC, etc.!
1822
- Fix to make AFL_SAN_NO_INST work with gcc_plugin
1923
- MacOS aflpp driver compilation fix (-fsanitize=fuzzer implementation)
2024
- Make AFL_DUMP_MAP_SIZE work even if the target has sanitizer issues

‎docs/fuzzing_in_depth.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -869,10 +869,11 @@ Here are some of the most important caveats for AFL++:
869869

870870
- There is no direct support for fuzzing network services, background daemons,
871871
or interactive apps that require UI interaction to work. You may need to make
872-
simple code changes to make them behave in a more traditional way. Preeny or
873-
libdesock may offer a relatively simple option, too - see:
872+
simple code changes to make them behave in a more traditional way. Preeny,
873+
libdesock or desockmulti may offer a relatively simple option, too - see:
874874
[https://github.com/zardus/preeny](https://github.com/zardus/preeny) or
875875
[https://github.com/fkie-cad/libdesock](https://github.com/fkie-cad/libdesock)
876+
[https://github.com/zyingp/desockmulti](https://github.com/zyingp/desockmulti)
876877

877878
Some useful tips for modifying network-based services can be also found at:
878879
[https://www.fastly.com/blog/how-to-fuzz-server-american-fuzzy-lop](https://www.fastly.com/blog/how-to-fuzz-server-american-fuzzy-lop)

‎include/afl-fuzz.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1216,7 +1216,6 @@ u8 *describe_op(afl_state_t *, u8, size_t);
12161216
#endif
12171217
u8 save_if_interesting(afl_state_t *, void *, u32, u8);
12181218
u8 has_new_bits(afl_state_t *, u8 *);
1219-
u8 has_new_bits_unclassified(afl_state_t *, u8 *);
12201219
#ifndef AFL_SHOWMAP
12211220
void classify_counts(afl_forkserver_t *);
12221221
#endif

‎include/forkserver.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,7 @@ typedef enum fsrv_run_result {
242242

243243
void afl_fsrv_init(afl_forkserver_t *fsrv);
244244
void afl_fsrv_init_dup(afl_forkserver_t *fsrv_to, afl_forkserver_t *from);
245+
void afl_fsrv_setup_preload(afl_forkserver_t *fsrv, char *argv0);
245246
void afl_fsrv_start(afl_forkserver_t *fsrv, char **argv,
246247
volatile u8 *stop_soon_p, u8 debug_child_output);
247248
u32 afl_fsrv_get_mapsize(afl_forkserver_t *fsrv, char **argv,

‎instrumentation/SanitizerCoverageLTO.so.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ class ModuleSanitizerCoverageLTOLegacyPass : public ModulePass {
333333

334334
} else {
335335

336-
if (getenv("AFL_DEBUG")) { DEBUGF("Instrument disabled\n"); }
336+
if (getenv("AFL_DEBUG")) { DEBUGF("Instrumentation disabled\n"); }
337337
return false;
338338

339339
}
@@ -396,7 +396,7 @@ PreservedAnalyses ModuleSanitizerCoverageLTO::run(Module &M,
396396

397397
} else {
398398

399-
if (debug) { DEBUGF("Instrument disabled\n"); }
399+
if (debug) { DEBUGF("Instrumentation disabled\n"); }
400400

401401
}
402402

0 commit comments

Comments
 (0)
0