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

fix llvm_mode selection

Browse Source
This commit is contained in:
van Hauser
2020-05-22 11:22:30 +02:00
parent 5d0bcf8152
commit 5b9dfa0600
1 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
llvm_mode/afl-clang-fast.c
View File

@ -53,22 +53,22 @@ u8 use_stdin = 0; /* dummy */
enum { enum {
INSTRUMENT_CLASSIC = 0, INSTURMENT_DEFAULT = 0,
INSTRUMENT_AFL = 0, INSTRUMENT_CLASSIC = 1,
INSTRUMENT_DEFAULT = 0, INSTRUMENT_AFL = 1,
INSTRUMENT_PCGUARD = 1, INSTRUMENT_PCGUARD = 2,
INSTRUMENT_INSTRIM = 2, INSTRUMENT_INSTRIM = 3,
INSTRUMENT_CFG = 2, INSTRUMENT_CFG = 3,
INSTRUMENT_LTO = 3, INSTRUMENT_LTO = 4,
INSTRUMENT_OPT_CTX = 4, INSTRUMENT_OPT_CTX = 8,
INSTRUMENT_OPT_NGRAM = 8 INSTRUMENT_OPT_NGRAM = 16
}; };
char instrument_mode_string[10][16] = { char instrument_mode_string[18][18] = {
"CLASSIC", "PCGUARD", "CFG", "LTO", "CTX", "", "DEFAULT", "CLASSIC", "PCGUARD", "CFG", "LTO", "", "", "", "CTX", "",
"", "", "NGRAM", "" "", "", "", "", "", "", "NGRAM", ""
}; };
@ -584,13 +584,6 @@ int main(int argc, char **argv, char **envp) {
be_quiet = 1; be_quiet = 1;
#ifndef USE_TRACE_PC
if (getenv("AFL_LLVM_WHITELIST"))
instrument_mode = INSTRUMENT_AFL;
else
#endif
instrument_mode = INSTRUMENT_PCGUARD;
if (getenv("USE_TRACE_PC") || getenv("AFL_USE_TRACE_PC") || if (getenv("USE_TRACE_PC") || getenv("AFL_USE_TRACE_PC") ||
getenv("AFL_LLVM_USE_TRACE_PC") || getenv("AFL_TRACE_PC")) { getenv("AFL_LLVM_USE_TRACE_PC") || getenv("AFL_TRACE_PC")) {
@ -632,12 +625,11 @@ int main(int argc, char **argv, char **envp) {
while (ptr) { while (ptr) {
if (strncasecmp(ptr, "default", strlen("default")) == 0 || if (strncasecmp(ptr, "afl", strlen("afl")) == 0 ||
strncasecmp(ptr, "afl", strlen("afl")) == 0 ||
strncasecmp(ptr, "classic", strlen("classic")) == 0) { strncasecmp(ptr, "classic", strlen("classic")) == 0) {
if (!instrument_mode || instrument_mode == INSTRUMENT_DEFAULT) if (!instrument_mode || instrument_mode == INSTRUMENT_AFL)
instrument_mode = INSTRUMENT_DEFAULT; instrument_mode = INSTRUMENT_AFL;
else else
FATAL("main instrumentation mode already set with %s", FATAL("main instrumentation mode already set with %s",
instrument_mode_string[instrument_mode]); instrument_mode_string[instrument_mode]);
@ -743,6 +735,17 @@ int main(int argc, char **argv, char **envp) {
} }
if (instrument_mode == 0) {
#ifndef USE_TRACE_PC
if (getenv("AFL_LLVM_WHITELIST"))
instrument_mode = INSTRUMENT_AFL;
else
#endif
instrument_mode = INSTRUMENT_PCGUARD;
}
if (instrument_opt_mode && lto_mode) if (instrument_opt_mode && lto_mode)
FATAL( FATAL(
"CTX and NGRAM can not be used in LTO mode (and would make LTO " "CTX and NGRAM can not be used in LTO mode (and would make LTO "