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

code format

Browse Source
This commit is contained in:
Andrea Fioraldi
2020-02-16 13:21:39 +01:00
parent 8acd503526
commit ef00ed6090
7 changed files with 50 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/argv_fuzzing/argv-fuzz-inl.h
View File

@ -53,7 +53,7 @@
} while (0) } while (0)
#define MAX_CMDLINE_LEN 100000 #define MAX_CMDLINE_LEN 100000
#define MAX_CMDLINE_PAR 50000 #define MAX_CMDLINE_PAR 50000
static char** afl_init_argv(int* argc) { static char** afl_init_argv(int* argc) {

2
include/config.h
View File

@ -26,7 +26,7 @@
/* Version string: */ /* Version string: */
// c = release, d = volatile github dev, e = experimental branch // c = release, d = volatile github dev, e = experimental branch
#define VERSION "++2.60d" #define VERSION "++2.60d"
/****************************************************** /******************************************************

19
llvm_mode/LLVMInsTrim.so.cc
View File

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

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

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

47
qemu_mode/patches/afl-qemu-cpu-translate-inl.h
View File

@ -41,9 +41,8 @@
#define _DEFAULT_MO MO_32 #define _DEFAULT_MO MO_32
#endif #endif
void HELPER(afl_compcov_16)(target_ulong cur_loc, target_ulong arg1, void HELPER(afl_compcov_16)(target_ulong cur_loc, target_ulong arg1,
target_ulong arg2) { target_ulong arg2) {
register uintptr_t idx = cur_loc; register uintptr_t idx = cur_loc;
@ -52,7 +51,7 @@ void HELPER(afl_compcov_16)(target_ulong cur_loc, target_ulong arg1,
} }
void HELPER(afl_compcov_32)(target_ulong cur_loc, target_ulong arg1, void HELPER(afl_compcov_32)(target_ulong cur_loc, target_ulong arg1,
target_ulong arg2) { target_ulong arg2) {
register uintptr_t idx = cur_loc; register uintptr_t idx = cur_loc;
@ -71,7 +70,7 @@ void HELPER(afl_compcov_32)(target_ulong cur_loc, target_ulong arg1,
} }
void HELPER(afl_compcov_64)(target_ulong cur_loc, target_ulong arg1, void HELPER(afl_compcov_64)(target_ulong cur_loc, target_ulong arg1,
target_ulong arg2) { target_ulong arg2) {
register uintptr_t idx = cur_loc; register uintptr_t idx = cur_loc;
@ -110,7 +109,7 @@ void HELPER(afl_compcov_64)(target_ulong cur_loc, target_ulong arg1,
} }
void HELPER(afl_cmplog_16)(target_ulong cur_loc, target_ulong arg1, void HELPER(afl_cmplog_16)(target_ulong cur_loc, target_ulong arg1,
target_ulong arg2) { target_ulong arg2) {
register uintptr_t k = (uintptr_t)cur_loc; register uintptr_t k = (uintptr_t)cur_loc;
@ -129,7 +128,7 @@ void HELPER(afl_cmplog_16)(target_ulong cur_loc, target_ulong arg1,
} }
void HELPER(afl_cmplog_32)(target_ulong cur_loc, target_ulong arg1, void HELPER(afl_cmplog_32)(target_ulong cur_loc, target_ulong arg1,
target_ulong arg2) { target_ulong arg2) {
register uintptr_t k = (uintptr_t)cur_loc; register uintptr_t k = (uintptr_t)cur_loc;
@ -145,7 +144,7 @@ void HELPER(afl_cmplog_32)(target_ulong cur_loc, target_ulong arg1,
} }
void HELPER(afl_cmplog_64)(target_ulong cur_loc, target_ulong arg1, void HELPER(afl_cmplog_64)(target_ulong cur_loc, target_ulong arg1,
target_ulong arg2) { target_ulong arg2) {
register uintptr_t k = (uintptr_t)cur_loc; register uintptr_t k = (uintptr_t)cur_loc;
@ -169,7 +168,7 @@ static void afl_gen_compcov(target_ulong cur_loc, TCGv arg1, TCGv arg2,
cur_loc = (cur_loc >> 4) ^ (cur_loc << 8); cur_loc = (cur_loc >> 4) ^ (cur_loc << 8);
cur_loc &= CMP_MAP_W - 1; cur_loc &= CMP_MAP_W - 1;
TCGv cur_loc_v = tcg_const_tl(cur_loc); TCGv cur_loc_v = tcg_const_tl(cur_loc);
switch (ot) { switch (ot) {
@ -180,7 +179,7 @@ static void afl_gen_compcov(target_ulong cur_loc, TCGv arg1, TCGv arg2,
default: break; default: break;
} }
tcg_temp_free(cur_loc_v); tcg_temp_free(cur_loc_v);
} else if (afl_compcov_level) { } else if (afl_compcov_level) {
@ -189,7 +188,7 @@ static void afl_gen_compcov(target_ulong cur_loc, TCGv arg1, TCGv arg2,
cur_loc = (cur_loc >> 4) ^ (cur_loc << 8); cur_loc = (cur_loc >> 4) ^ (cur_loc << 8);
cur_loc &= MAP_SIZE - 7; cur_loc &= MAP_SIZE - 7;
TCGv cur_loc_v = tcg_const_tl(cur_loc); TCGv cur_loc_v = tcg_const_tl(cur_loc);
if (cur_loc >= afl_inst_rms) return; if (cur_loc >= afl_inst_rms) return;
@ -202,7 +201,7 @@ static void afl_gen_compcov(target_ulong cur_loc, TCGv arg1, TCGv arg2,
default: break; default: break;
} }
tcg_temp_free(cur_loc_v); tcg_temp_free(cur_loc_v);
} }
@ -293,7 +292,8 @@ static void gpr_saving(TCGv *cpu_regs, int regs_num) {
afl_gen_tcg_plain_call(&afl_persistent_loop); afl_gen_tcg_plain_call(&afl_persistent_loop);
if (afl_persistent_hook_ptr) afl_gen_tcg_plain_call(callback_to_persistent_hook); if (afl_persistent_hook_ptr)
afl_gen_tcg_plain_call(callback_to_persistent_hook);
// restore GPR registers // restore GPR registers
for (i = 0; i < regs_num; ++i) { for (i = 0; i < regs_num; ++i) {
@ -334,19 +334,20 @@ static void restore_state_for_persistent(TCGv *cpu_regs, int regs_num, int sp) {
if (s->pc == afl_persistent_addr) { \ if (s->pc == afl_persistent_addr) { \
\ \
restore_state_for_persistent(cpu_regs, AFL_REGS_NUM, R_ESP); \ restore_state_for_persistent(cpu_regs, AFL_REGS_NUM, R_ESP); \
/*afl_gen_tcg_plain_call(log_x86_saved_gpr); \ /*afl_gen_tcg_plain_call(log_x86_saved_gpr); \
afl_gen_tcg_plain_call(log_x86_sp_content);*/ \ afl_gen_tcg_plain_call(log_x86_sp_content);*/ \
\ \
if (afl_persistent_ret_addr == 0) { \ if (afl_persistent_ret_addr == 0) { \
\ \
TCGv paddr = tcg_const_tl(afl_persistent_addr); \ TCGv paddr = tcg_const_tl(afl_persistent_addr); \
tcg_gen_qemu_st_tl(paddr, cpu_regs[R_ESP], persisent_retaddr_offset, _DEFAULT_MO); \ tcg_gen_qemu_st_tl(paddr, cpu_regs[R_ESP], persisent_retaddr_offset, \
tcg_temp_free(paddr); \ _DEFAULT_MO); \
tcg_temp_free(paddr); \
\ \
} \ } \
\ \
if (!persistent_save_gpr) afl_gen_tcg_plain_call(&afl_persistent_loop); \ if (!persistent_save_gpr) afl_gen_tcg_plain_call(&afl_persistent_loop); \
/*afl_gen_tcg_plain_call(log_x86_sp_content);*/ \ /*afl_gen_tcg_plain_call(log_x86_sp_content);*/ \
\ \
} else if (afl_persistent_ret_addr && s->pc == afl_persistent_ret_addr) { \ } else if (afl_persistent_ret_addr && s->pc == afl_persistent_ret_addr) { \
\ \
@ -368,11 +369,11 @@ static void restore_state_for_persistent(TCGv *cpu_regs, int regs_num, int sp) {
\ \
if (afl_persistent_ret_addr == 0) { \ if (afl_persistent_ret_addr == 0) { \
\ \
tcg_gen_movi_tl(cpu_R[14], afl_persistent_addr); \ tcg_gen_movi_tl(cpu_R[14], afl_persistent_addr); \
\ \
} \ } \
\ \
if (!persistent_save_gpr) afl_gen_tcg_plain_call(&afl_persistent_loop); \ if (!persistent_save_gpr) afl_gen_tcg_plain_call(&afl_persistent_loop); \
\ \
} else if (afl_persistent_ret_addr && dc->pc == afl_persistent_ret_addr) { \ } else if (afl_persistent_ret_addr && dc->pc == afl_persistent_ret_addr) { \
\ \
@ -393,11 +394,11 @@ static void restore_state_for_persistent(TCGv *cpu_regs, int regs_num, int sp) {
\ \
if (afl_persistent_ret_addr == 0) { \ if (afl_persistent_ret_addr == 0) { \
\ \
tcg_gen_movi_tl(cpu_X[30], afl_persistent_addr); \ tcg_gen_movi_tl(cpu_X[30], afl_persistent_addr); \
\ \
} \ } \
\ \
if (!persistent_save_gpr) afl_gen_tcg_plain_call(&afl_persistent_loop); \ if (!persistent_save_gpr) afl_gen_tcg_plain_call(&afl_persistent_loop); \
\ \
} else if (afl_persistent_ret_addr && s->pc == afl_persistent_ret_addr) { \ } else if (afl_persistent_ret_addr && s->pc == afl_persistent_ret_addr) { \
\ \

3
qemu_mode/patches/afl-qemu-tcg-inl.h
View File

@ -33,7 +33,7 @@
void afl_gen_tcg_plain_call(void *func) { void afl_gen_tcg_plain_call(void *func) {
TCGOp * op = tcg_emit_op(INDEX_op_call); TCGOp *op = tcg_emit_op(INDEX_op_call);
TCGOP_CALLO(op) = 0; TCGOP_CALLO(op) = 0;
@ -42,3 +42,4 @@ void afl_gen_tcg_plain_call(void *func) {
TCGOP_CALLI(op) = 0; TCGOP_CALLI(op) = 0;
} }

26
src/afl-as.c
View File

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