commit 1e1e67d0a7d16db0a4331702af713a163c40b87f Author: Jesse Schwartzentruber Date: Fri Jul 14 11:04:04 2023 -0400 Increase MAP_SIZE for Nyx diff --git a/include/config.h b/include/config.h index 988e536e..5e9870c0 100644 --- a/include/config.h +++ b/include/config.h @@ -442,7 +442,7 @@ problems with complex programs). You need to recompile the target binary after changing this - otherwise, SEGVs may ensue. */ -#define MAP_SIZE_POW2 16 +#define MAP_SIZE_POW2 23 /* Do not change this unless you really know what you are doing. */ commit e46fac6063f7b0b6eca8e140b10c3a107deb0a0f Author: Christian Holler (:decoder) Date: Wed Mar 6 10:19:52 2024 +0100 Fix delayed pcmap writing for code coverage with pc-table diff --git a/instrumentation/afl-compiler-rt.o.c b/instrumentation/afl-compiler-rt.o.c index caa3c3a8..76ceb451 100644 --- a/instrumentation/afl-compiler-rt.o.c +++ b/instrumentation/afl-compiler-rt.o.c @@ -1837,7 +1837,7 @@ void __sanitizer_cov_pcs_init(const uintptr_t *pcs_beg, } - if (pc_filter) { + if (pc_filter && !mod_info->next) { char PcDescr[1024]; // This function is a part of the sanitizer run-time. @@ -1864,7 +1864,7 @@ void __sanitizer_cov_pcs_init(const uintptr_t *pcs_beg, } - if (__afl_filter_pcs && strstr(mod_info->name, __afl_filter_pcs_module)) { + if (__afl_filter_pcs && !mod_info->next && strstr(mod_info->name, __afl_filter_pcs_module)) { u32 result_index; if (locate_in_pcs(PC, &result_index)) { @@ -1889,7 +1889,11 @@ void __sanitizer_cov_pcs_init(const uintptr_t *pcs_beg, } - mod_info->mapped = 1; + if (__afl_pcmap_ptr) { + + mod_info->mapped = 1; + + } if (__afl_debug) { commit 58206a3180479416e14ea324607be71ee69caa6f Author: Jesse Schwartzentruber Date: Wed Apr 17 14:40:41 2024 -0400 Set explicit visibility on shared memory variables. diff --git a/src/afl-cc.c b/src/afl-cc.c index dd4fb4ea..57089ae0 100644 --- a/src/afl-cc.c +++ b/src/afl-cc.c @@ -1591,8 +1591,10 @@ void add_defs_persistent_mode(aflcc_state_t *aflcc) { insert_param(aflcc, "-D__AFL_FUZZ_INIT()=" "int __afl_sharedmem_fuzzing = 1;" - "extern unsigned int *__afl_fuzz_len;" - "extern unsigned char *__afl_fuzz_ptr;" + "extern __attribute__((visibility(\"default\"))) " + "unsigned int *__afl_fuzz_len;" + "extern __attribute__((visibility(\"default\"))) " + "unsigned char *__afl_fuzz_ptr;" "unsigned char __afl_fuzz_alt[1048576];" "unsigned char *__afl_fuzz_alt_ptr = __afl_fuzz_alt;");