ExternalVendorCode/AFLplusplus
1
0
Fork 0
mirror of https://github.com/AFLplusplus/AFLplusplus.git synced 2025-06-14 11:08:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix issue #194 more seriously

Browse Source
This commit is contained in:
hexcoder-
2020-02-13 21:06:09 +01:00
parent afb23f09cf
commit 24dcc5eb37
6 changed files with 75 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gcc_plugin/afl-gcc-fast.c
View File

@ -192,6 +192,14 @@ static void edit_params(u32 argc, char** argv) {
}
if (getenv("AFL_USE_UBSAN")) {
cc_params[cc_par_cnt++] = "-fsanitize=undefined";
cc_params[cc_par_cnt++] = "-fsanitize-undefined-trap-on-error";
cc_params[cc_par_cnt++] = "-fno-sanitize-recover=all";
}
}
if (!getenv("AFL_DONT_OPTIMIZE")) {

22
llvm_mode/LLVMInsTrim.so.cc
View File

@ -480,13 +480,25 @@ struct InsTrim : public ModulePass {
}
OKF("Instrumented %u locations (%llu, %llu) (%s mode)\n", total_instr,
total_rs, total_hs,
char modeline[100];
snprintf(modeline, sizeof(modeline), "%s%s%s%s",
getenv("AFL_HARDEN")
? "hardened"
: ((getenv("AFL_USE_ASAN") || getenv("AFL_USE_MSAN"))
? "ASAN/MSAN"
: "non-hardened"));
: "non-hardened",
getenv("AFL_USE_ASAN")
? ", ASAN"
: "",
getenv("AFL_USE_MSAN")
? ", MSAN"
: "",
getenv("AFL_USE_UBSAN")
? ", UBSAN"
: ""
);
OKF("Instrumented %u locations (%llu, %llu) (%s mode)\n", total_instr,
total_rs, total_hs, modeline);
return false;
}

22
llvm_mode/afl-llvm-pass.so.cc
View File

@ -467,14 +467,26 @@ bool AFLCoverage::runOnModule(Module &M) {
if (!inst_blocks)
WARNF("No instrumentation targets found.");
else
OKF("Instrumented %u locations (%s mode, ratio %u%%).", inst_blocks,
else {
char modeline[100];
snprintf(modeline, sizeof(modeline), "%s%s%s%s",
getenv("AFL_HARDEN")
? "hardened"
: ((getenv("AFL_USE_ASAN") || getenv("AFL_USE_MSAN"))
? "ASAN/MSAN"
: "non-hardened"),
: "non-hardened",
getenv("AFL_USE_ASAN")
? ", ASAN"
: "",
getenv("AFL_USE_MSAN")
? ", MSAN"
: "",
getenv("AFL_USE_UBSAN")
? ", UBSAN"
: ""
);
OKF("Instrumented %u locations (%s mode, ratio %u%%).", inst_blocks,
modeline,
inst_ratio);
}
}

23
src/afl-as.c
View File

@ -478,13 +478,28 @@ static void add_instrumentation(void) {
if (!ins_lines)
WARNF("No instrumentation targets found%s.",
pass_thru ? " (pass-thru mode)" : "");
else
else {
char modeline[100];
snprintf(modeline, sizeof(modeline), "%s%s%s%s",
getenv("AFL_HARDEN")
? "hardened"
: "non-hardened",
getenv("AFL_USE_ASAN")
? ", ASAN"
: "",
getenv("AFL_USE_MSAN")
? ", MSAN"
: "",
getenv("AFL_USE_UBSAN")
? ", UBSAN"
: ""
);
OKF("Instrumented %u locations (%s-bit, %s mode, ratio %u%%).", ins_lines,
use_64bit ? "64" : "32",
getenv("AFL_HARDEN") ? "hardened"
: (sanitizer ? "ASAN/MSAN" : "non-hardened"),
modeline,
inst_ratio);
}
}
}

12
src/afl-gcc.c
View File

@ -282,6 +282,18 @@ static void edit_params(u32 argc, char** argv) {
}
if (!asan_set) {
if (getenv("AFL_USE_UBSAN")) {
cc_params[cc_par_cnt++] = "-fsanitize=undefined";
cc_params[cc_par_cnt++] = "-fsanitize-undefined-trap-on-error";
cc_params[cc_par_cnt++] = "-fno-sanitize-recover=all";
}
}
#ifdef USEMMAP
cc_params[cc_par_cnt++] = "-lrt";
#endif

1
test/test.sh
View File

@ -43,6 +43,7 @@ unset AFL_DEBUG
unset AFL_HARDEN
unset AFL_USE_ASAN
unset AFL_USE_MSAN
unset AFL_USE_UBSAN
unset AFL_CC
unset AFL_PRELOAD
unset AFL_GCC_WHITELIST