ExternalVendorCode/AFLplusplus
1
0
Fork 0
mirror of https://github.com/AFLplusplus/AFLplusplus.git synced 2025-06-07 15:51:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

code format

Browse Source
This commit is contained in:
vanhauser-thc 2025-05-13 10:51:56 +02:00
parent 6d4a56e481
commit 9e4449bad2
5 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/envs.h
View File

@ -119,8 +119,8 @@ static char *afl_environment_variables[] = {
"AFL_CFISAN_VERBOSE", "AFL_USE_LSAN", "AFL_WINE_PATH", "AFL_NO_SNAPSHOT", "AFL_CFISAN_VERBOSE", "AFL_USE_LSAN", "AFL_WINE_PATH", "AFL_NO_SNAPSHOT",
"AFL_EXPAND_HAVOC_NOW", "AFL_USE_FASAN", "AFL_USE_QASAN", "AFL_EXPAND_HAVOC_NOW", "AFL_USE_FASAN", "AFL_USE_QASAN",
"AFL_PRINT_FILENAMES", "AFL_PIZZA_MODE", "AFL_NO_FASTRESUME", "AFL_PRINT_FILENAMES", "AFL_PIZZA_MODE", "AFL_NO_FASTRESUME",
"AFL_SAN_ABSTRACTION", "AFL_LLVM_ONLY_FSRV", "AFL_GCC_ONLY_FRSV", "AFL_SAN_RECOVER", "AFL_SAN_ABSTRACTION", "AFL_LLVM_ONLY_FSRV", "AFL_GCC_ONLY_FRSV",
"AFL_PRELOAD_DISCRIMINATE_FORKSERVER_PARENT", NULL}; "AFL_SAN_RECOVER", "AFL_PRELOAD_DISCRIMINATE_FORKSERVER_PARENT", NULL};
extern char *afl_environment_variables[]; extern char *afl_environment_variables[];

6
instrumentation/afl-compiler-rt.o.c
View File

@ -1242,8 +1242,12 @@ void __afl_manual_init(void) {
} }
if (getenv("AFL_LLVM_ONLY_FSRV") || getenv("AFL_GCC_ONLY_FRSV")) { if (getenv("AFL_LLVM_ONLY_FSRV") || getenv("AFL_GCC_ONLY_FRSV")) {
fprintf(stderr, "DEBUG: Overwrite area_ptr to dummy due to AFL_LLVM_ONLY_FSRV/AFL_GCC_ONLY_FRSV\n");
fprintf(stderr,
"DEBUG: Overwrite area_ptr to dummy due to "
"AFL_LLVM_ONLY_FSRV/AFL_GCC_ONLY_FRSV\n");
__afl_area_ptr = __afl_area_ptr_dummy; __afl_area_ptr = __afl_area_ptr_dummy;
} }
if (!init_done) { if (!init_done) {

6
instrumentation/afl-gcc-pass.so.cc
View File

@ -506,9 +506,7 @@ int plugin_init(struct plugin_name_args *info,
bool fsrv_only = !!getenv("AFL_GCC_ONLY_FRSV"); bool fsrv_only = !!getenv("AFL_GCC_ONLY_FRSV");
const char *name = info->base_name; const char *name = info->base_name;
if (!fsrv_only) { if (!fsrv_only) { register_callback(name, PLUGIN_INFO, NULL, &afl_plugin); }
register_callback(name, PLUGIN_INFO, NULL, &afl_plugin);
}
afl_pass *aflp = new afl_pass(quiet, inst_ratio); afl_pass *aflp = new afl_pass(quiet, inst_ratio);
struct register_pass_info pass_info = { struct register_pass_info pass_info = {
@ -521,9 +519,11 @@ int plugin_init(struct plugin_name_args *info,
}; };
if (!fsrv_only) { if (!fsrv_only) {
register_callback(name, PLUGIN_PASS_MANAGER_SETUP, NULL, &pass_info); register_callback(name, PLUGIN_PASS_MANAGER_SETUP, NULL, &pass_info);
register_callback(name, PLUGIN_FINISH, afl_pass::plugin_finalize, register_callback(name, PLUGIN_FINISH, afl_pass::plugin_finalize,
pass_info.pass); pass_info.pass);
} }
if (!quiet) if (!quiet)

19
src/afl-common.c
View File

@ -819,15 +819,22 @@ void check_environment_vars(char **envp) {
WARNF("AFL environment variable %s is deprecated!", WARNF("AFL environment variable %s is deprecated!",
afl_environment_deprecated[i]); afl_environment_deprecated[i]);
if (strncmp(afl_environment_deprecated[i], if (strncmp(afl_environment_deprecated[i], "AFL_SAN_NO_INST",
"AFL_SAN_NO_INST", strlen(afl_environment_deprecated[i])) == 0) { strlen(afl_environment_deprecated[i])) == 0) {
WARNF("AFL_LLVM_ONLY_FSRV/AFL_GCC_ONLY_FSRV is induced and set instead.");
setenv("AFL_GCC_ONLY_FSRV", "1", 0); WARNF(
setenv("AFL_LLVM_ONLY_FSRV", "1", 0); "AFL_LLVM_ONLY_FSRV/AFL_GCC_ONLY_FSRV is induced and set "
"instead.");
setenv("AFL_GCC_ONLY_FSRV", "1", 0);
setenv("AFL_LLVM_ONLY_FSRV", "1", 0);
} else { } else {
issue_detected = 1; issue_detected = 1;
} }
} else { } else {
i++; i++;

5
src/afl-fuzz-sanfuzz.c
View File

@ -36,10 +36,11 @@ void sanfuzz_exec_child(afl_forkserver_t *fsrv, char **argv) {
argv[0] != fsrv->asanfuzz_binary) { argv[0] != fsrv->asanfuzz_binary) {
argv[0] = fsrv->asanfuzz_binary; argv[0] = fsrv->asanfuzz_binary;
} }
// In case users provide the normally instrumented binaries, this servers as the last // In case users provide the normally instrumented binaries, this servers as
// resort to avoid collecting incorrect coverage. // the last resort to avoid collecting incorrect coverage.
setenv("AFL_LLVM_ONLY_FSRV", "1", 0); setenv("AFL_LLVM_ONLY_FSRV", "1", 0);
execv(fsrv->target_path, argv); execv(fsrv->target_path, argv);