ExternalVendorCode/AFLplusplus
1
0
Fork 0
mirror of https://github.com/AFLplusplus/AFLplusplus.git synced 2025-06-19 13:03:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fuzzbench integration

Browse Source
This commit is contained in:
van Hauser
2020-08-10 11:45:32 +02:00
parent 3aa7d8081d
commit 464c27082a
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
examples/aflpp_driver/aflpp_driver.c
View File

@ -266,7 +266,7 @@ __attribute__((constructor(1))) void __afl_protect(void) {
int main(int argc, char **argv) { int main(int argc, char **argv) {
fprintf(stderr, "dummy map is at %p\n", __afl_area_ptr); fprintf(stderr, "map is at %p\n", __afl_area_ptr);
printf( printf(
"======================= INFO =========================\n" "======================= INFO =========================\n"
@ -305,10 +305,11 @@ int main(int argc, char **argv) {
printf("WARNING: using the deprecated call style `%s %d`\n", argv[0], N); printf("WARNING: using the deprecated call style `%s %d`\n", argv[0], N);
else if (argc > 1) { else if (argc > 1) {
__afl_sharedmem_fuzzing = 0; if (!getenv("AFL_DISABLE_LLVM_INSTRUMENTATION")) {
munmap(__afl_area_ptr, MAX_DUMMY_SIZE); // we need to free 0x10000 munmap(__afl_area_ptr, MAX_DUMMY_SIZE); // we need to free 0x10000
__afl_area_ptr = NULL; __afl_area_ptr = NULL;
__afl_manual_init(); __afl_manual_init();
}
return ExecuteFilesOnyByOne(argc, argv); return ExecuteFilesOnyByOne(argc, argv);
} }
@ -318,9 +319,10 @@ int main(int argc, char **argv) {
if (!getenv("AFL_DISABLE_LLVM_INSTRUMENTATION")) { if (!getenv("AFL_DISABLE_LLVM_INSTRUMENTATION")) {
munmap(__afl_area_ptr, MAX_DUMMY_SIZE); munmap(__afl_area_ptr, MAX_DUMMY_SIZE);
__afl_area_ptr = NULL; __afl_area_ptr = NULL;
fprintf(stderr, "performing manual init\n");
__afl_manual_init(); __afl_manual_init();
} }
fprintf(stderr, "dummy map is now at %p\n", __afl_area_ptr); fprintf(stderr, "map is now at %p\n", __afl_area_ptr);
// Call LLVMFuzzerTestOneInput here so that coverage caused by initialization // Call LLVMFuzzerTestOneInput here so that coverage caused by initialization
// on the first execution of LLVMFuzzerTestOneInput is ignored. // on the first execution of LLVMFuzzerTestOneInput is ignored.

7
llvm_mode/afl-llvm-rt.o.c
View File

@ -834,6 +834,11 @@ void __afl_manual_init(void) {
if (getenv("AFL_DISABLE_LLVM_INSTRUMENTATION")) { if (getenv("AFL_DISABLE_LLVM_INSTRUMENTATION")) {
init_done = 1; init_done = 1;
is_persistent = 0;
__afl_sharedmem_fuzzing = 0;
if (__afl_area_ptr == NULL)
__afl_area_ptr = __afl_area_initial;
if (getenv("AFL_DEBUG")) if (getenv("AFL_DEBUG"))
fprintf(stderr, fprintf(stderr,
"DEBUG: disabled instrumenation because of " "DEBUG: disabled instrumenation because of "
@ -855,6 +860,8 @@ void __afl_manual_init(void) {
__attribute__((constructor(CONST_PRIO))) void __afl_auto_init(void) { __attribute__((constructor(CONST_PRIO))) void __afl_auto_init(void) {
if (getenv("AFL_DISABLE_LLVM_INSTRUMENTATION")) return;
is_persistent = !!getenv(PERSIST_ENV_VAR); is_persistent = !!getenv(PERSIST_ENV_VAR);
if (getenv(DEFER_ENV_VAR)) return; if (getenv(DEFER_ENV_VAR)) return;