diff options
| -rw-r--r-- | instrumentation/afl-compiler-rt.o.c | 25 | ||||
| -rw-r--r-- | src/afl-cc.c | 93 |
2 files changed, 72 insertions, 46 deletions
diff --git a/instrumentation/afl-compiler-rt.o.c b/instrumentation/afl-compiler-rt.o.c index 59839750..9a12831e 100644 --- a/instrumentation/afl-compiler-rt.o.c +++ b/instrumentation/afl-compiler-rt.o.c @@ -282,11 +282,9 @@ static void __afl_map_shm(void) { char *id_str = getenv(SHM_ENV_VAR); - if (__afl_final_loc) { ++__afl_final_loc; } // as we count starting 0 - if (__afl_final_loc) { - __afl_map_size = __afl_final_loc; + __afl_map_size = ++__afl_final_loc; // as we count starting 0 if (__afl_final_loc > MAP_SIZE) { @@ -333,14 +331,14 @@ static void __afl_map_shm(void) { if (__afl_debug) { - fprintf(stderr, - "DEBUG: (1) id_str %s, __afl_area_ptr %p, __afl_area_initial %p, " - "__afl_area_ptr_dummy %p, __afl_map_addr 0x%llx, MAP_SIZE %u, " - "__afl_final_loc %u, " - "max_size_forkserver %u/0x%x\n", - id_str == NULL ? "<null>" : id_str, __afl_area_ptr, - __afl_area_initial, __afl_area_ptr_dummy, __afl_map_addr, MAP_SIZE, - __afl_final_loc, FS_OPT_MAX_MAPSIZE, FS_OPT_MAX_MAPSIZE); + fprintf( + stderr, + "DEBUG: (1) id_str %s, __afl_area_ptr %p, __afl_area_initial %p, " + "__afl_area_ptr_dummy %p, __afl_map_addr 0x%llx, MAP_SIZE %u, " + "__afl_final_loc %u, __afl_map_size %u, max_size_forkserver %u/0x%x\n", + id_str == NULL ? "<null>" : id_str, __afl_area_ptr, __afl_area_initial, + __afl_area_ptr_dummy, __afl_map_addr, MAP_SIZE, __afl_final_loc, + __afl_map_size, FS_OPT_MAX_MAPSIZE, FS_OPT_MAX_MAPSIZE); } @@ -487,11 +485,12 @@ static void __afl_map_shm(void) { fprintf(stderr, "DEBUG: (2) id_str %s, __afl_area_ptr %p, __afl_area_initial %p, " "__afl_area_ptr_dummy %p, __afl_map_addr 0x%llx, MAP_SIZE " - "%u, __afl_final_loc %u, " + "%u, __afl_final_loc %u, __afl_map_size %u," "max_size_forkserver %u/0x%x\n", id_str == NULL ? "<null>" : id_str, __afl_area_ptr, __afl_area_initial, __afl_area_ptr_dummy, __afl_map_addr, MAP_SIZE, - __afl_final_loc, FS_OPT_MAX_MAPSIZE, FS_OPT_MAX_MAPSIZE); + __afl_final_loc, __afl_map_size, FS_OPT_MAX_MAPSIZE, + FS_OPT_MAX_MAPSIZE); } diff --git a/src/afl-cc.c b/src/afl-cc.c index 9197c74b..1f28b1f9 100644 --- a/src/afl-cc.c +++ b/src/afl-cc.c @@ -315,7 +315,7 @@ static void edit_params(u32 argc, char **argv, char **envp) { u8 fortify_set = 0, asan_set = 0, x_set = 0, bit_mode = 0, shared_linking = 0, preprocessor_only = 0, have_unroll = 0, have_o = 0, have_pic = 0, - have_c = 0, partial_linking = 0; + have_c = 0, partial_linking = 0, wasm_linking = 0; cc_params = ck_alloc((argc + 128) * sizeof(u8 *)); @@ -671,22 +671,6 @@ static void edit_params(u32 argc, char **argv, char **envp) { // cc_params[cc_par_cnt++] = "-Qunused-arguments"; - // in case LLVM is installed not via a package manager or "make install" - // e.g. compiled download or compiled from github then its ./lib directory - // might not be in the search path. Add it if so. - u8 *libdir = strdup(LLVM_LIBDIR); - if (plusplus_mode && strlen(libdir) && strncmp(libdir, "/usr", 4) && - strncmp(libdir, "/lib", 4)) { - - cc_params[cc_par_cnt++] = "-rpath"; - cc_params[cc_par_cnt++] = libdir; - - } else { - - free(libdir); - - } - if (lto_mode && argc > 1) { u32 idx; @@ -766,14 +750,21 @@ static void edit_params(u32 argc, char **argv, char **envp) { u8 *afllib = find_object("libAFLDriver.a", argv[0]); - if (!be_quiet) + if (!be_quiet) { + OKF("Found '-fsanitize=fuzzer', replacing with libAFLDriver.a"); + } + if (!afllib) { - WARNF( - "Cannot find 'libAFLDriver.a' to replace '-fsanitize=fuzzer' in " - "the flags - this will fail!"); + if (!be_quiet) { + + WARNF( + "Cannot find 'libAFLDriver.a' to replace '-fsanitize=fuzzer' in " + "the flags - this will fail!"); + + } } else { @@ -805,6 +796,13 @@ static void edit_params(u32 argc, char **argv, char **envp) { if (!strcmp(cur, "-x")) x_set = 1; if (!strcmp(cur, "-E")) preprocessor_only = 1; if (!strcmp(cur, "-shared")) shared_linking = 1; + if (!strcmp(cur, "--target=wasm32-wasi")) { + + if (!be_quiet) { WARNF("Found '%s'!", cur); } + wasm_linking = 1; + + } + if (!strcmp(cur, "-dynamiclib")) shared_linking = 1; if (!strcmp(cur, "-Wl,-r")) partial_linking = 1; if (!strcmp(cur, "-Wl,-i")) partial_linking = 1; @@ -820,6 +818,22 @@ static void edit_params(u32 argc, char **argv, char **envp) { } + // in case LLVM is installed not via a package manager or "make install" + // e.g. compiled download or compiled from github then its ./lib directory + // might not be in the search path. Add it if so. + u8 *libdir = strdup(LLVM_LIBDIR); + if (plusplus_mode && !wasm_linking && strlen(libdir) && + strncmp(libdir, "/usr", 4) && strncmp(libdir, "/lib", 4)) { + + cc_params[cc_par_cnt++] = "-rpath"; + cc_params[cc_par_cnt++] = libdir; + + } else { + + free(libdir); + + } + if (getenv("AFL_HARDEN")) { cc_params[cc_par_cnt++] = "-fstack-protector-all"; @@ -1056,7 +1070,7 @@ static void edit_params(u32 argc, char **argv, char **envp) { switch (bit_mode) { case 0: - if (!shared_linking && !partial_linking) + if (!shared_linking && !partial_linking && !wasm_linking) cc_params[cc_par_cnt++] = alloc_printf("%s/afl-compiler-rt.o", obj_path); if (lto_mode) @@ -1065,7 +1079,7 @@ static void edit_params(u32 argc, char **argv, char **envp) { break; case 32: - if (!shared_linking && !partial_linking) { + if (!shared_linking && !partial_linking && !wasm_linking) { cc_params[cc_par_cnt++] = alloc_printf("%s/afl-compiler-rt-32.o", obj_path); @@ -1086,7 +1100,7 @@ static void edit_params(u32 argc, char **argv, char **envp) { break; case 64: - if (!shared_linking && !partial_linking) { + if (!shared_linking && !partial_linking && !wasm_linking) { cc_params[cc_par_cnt++] = alloc_printf("%s/afl-compiler-rt-64.o", obj_path); @@ -1109,7 +1123,7 @@ static void edit_params(u32 argc, char **argv, char **envp) { } #if !defined(__APPLE__) && !defined(__sun) - if (!shared_linking && !partial_linking) + if (!shared_linking && !partial_linking && !wasm_linking) cc_params[cc_par_cnt++] = alloc_printf("-Wl,--dynamic-list=%s/dynamic_list.txt", obj_path); #endif @@ -1248,10 +1262,14 @@ int main(int argc, char **argv, char **envp) { if (compiler_mode) { - WARNF( - "\"AFL_CC_COMPILER\" is set but a specific compiler was already " - "selected by command line parameter or symlink, ignoring the " - "environment variable!"); + if (!be_quiet) { + + WARNF( + "\"AFL_CC_COMPILER\" is set but a specific compiler was already " + "selected by command line parameter or symlink, ignoring the " + "environment variable!"); + + } } else { @@ -1304,11 +1322,14 @@ int main(int argc, char **argv, char **envp) { } - if (compiler_mode) + if (compiler_mode && !be_quiet) { + WARNF( "--afl-... compiler mode supersedes the AFL_CC_COMPILER and " "symlink compiler selection!"); + } + ptr = argv[i]; ptr += 5; while (*ptr == '-') @@ -1390,7 +1411,7 @@ int main(int argc, char **argv, char **envp) { } - if (have_instr_env && getenv("AFL_DONT_OPTIMIZE")) { + if (have_instr_env && getenv("AFL_DONT_OPTIMIZE") && !be_quiet) { WARNF( "AFL_LLVM_ALLOWLIST/DENYLIST and AFL_DONT_OPTIMIZE cannot be combined " @@ -1970,10 +1991,13 @@ int main(int argc, char **argv, char **envp) { } else { - if (!be_quiet) + if (!be_quiet) { + WARNF("afl-clang-lto called with mode %s, using that mode instead", instrument_mode_string[instrument_mode]); + } + } } @@ -1985,11 +2009,14 @@ int main(int argc, char **argv, char **envp) { if (have_instr_env) { instrument_mode = INSTRUMENT_AFL; - if (!be_quiet) + if (!be_quiet) { + WARNF( "Switching to classic instrumentation because " "AFL_LLVM_ALLOWLIST/DENYLIST does not work with PCGUARD < 10.0.1."); + } + } else #endif |