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

code format

Browse Source
This commit is contained in:
vanhauser-thc
2023-05-21 17:49:14 +02:00
parent 1416fea160
commit 029e039cbc
16 changed files with 53 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.custom-format.py
View File

@ -24,7 +24,7 @@ import importlib.metadata
# string_re = re.compile('(\\"(\\\\.|[^"\\\\])*\\")') # TODO: for future use # string_re = re.compile('(\\"(\\\\.|[^"\\\\])*\\")') # TODO: for future use
CURRENT_LLVM = os.getenv('LLVM_VERSION', 14) CURRENT_LLVM = os.getenv('LLVM_VERSION', 15)
CLANG_FORMAT_BIN = os.getenv("CLANG_FORMAT_BIN", "") CLANG_FORMAT_BIN = os.getenv("CLANG_FORMAT_BIN", "")

4
frida_mode/src/lib/lib_apple.c
View File

@ -17,8 +17,8 @@ static gboolean lib_get_main_module(const GumModuleDetails *details,
GumDarwinModule **ret = (GumDarwinModule **)user_data; GumDarwinModule **ret = (GumDarwinModule **)user_data;
GumDarwinModule *module = gum_darwin_module_new_from_memory( GumDarwinModule *module = gum_darwin_module_new_from_memory(
details->path, mach_task_self(), details->range->base_address, details->path, mach_task_self(), details->range->base_address,
GUM_DARWIN_MODULE_FLAGS_NONE, NULL); GUM_DARWIN_MODULE_FLAGS_NONE, NULL);
FVERBOSE("Found main module: %s", module->name); FVERBOSE("Found main module: %s", module->name);

2
include/config.h
View File

@ -81,7 +81,7 @@
will be kept and written to the crash/ directory as RECORD:... files. will be kept and written to the crash/ directory as RECORD:... files.
Note that every crash will be written, not only unique ones! */ Note that every crash will be written, not only unique ones! */
//#define AFL_PERSISTENT_RECORD // #define AFL_PERSISTENT_RECORD
/* console output colors: There are three ways to configure its behavior /* console output colors: There are three ways to configure its behavior
* 1. default: colored outputs fixed on: defined USE_COLOR && defined * 1. default: colored outputs fixed on: defined USE_COLOR && defined

4
instrumentation/SanitizerCoverageLTO.so.cc
View File

@ -1478,8 +1478,8 @@ GlobalVariable *ModuleSanitizerCoverageLTO::CreateFunctionLocalArrayInSection(
ArrayType *ArrayTy = ArrayType::get(Ty, NumElements); ArrayType *ArrayTy = ArrayType::get(Ty, NumElements);
auto Array = new GlobalVariable( auto Array = new GlobalVariable(
*CurModule, ArrayTy, false, GlobalVariable::PrivateLinkage, *CurModule, ArrayTy, false, GlobalVariable::PrivateLinkage,
Constant::getNullValue(ArrayTy), "__sancov_gen_"); Constant::getNullValue(ArrayTy), "__sancov_gen_");
#if LLVM_VERSION_MAJOR >= 13 #if LLVM_VERSION_MAJOR >= 13
if (TargetTriple.supportsCOMDAT() && if (TargetTriple.supportsCOMDAT() &&

4
instrumentation/SanitizerCoveragePCGUARD.so.cc
View File

@ -714,8 +714,8 @@ GlobalVariable *ModuleSanitizerCoverageAFL::CreateFunctionLocalArrayInSection(
ArrayType *ArrayTy = ArrayType::get(Ty, NumElements); ArrayType *ArrayTy = ArrayType::get(Ty, NumElements);
auto Array = new GlobalVariable( auto Array = new GlobalVariable(
*CurModule, ArrayTy, false, GlobalVariable::PrivateLinkage, *CurModule, ArrayTy, false, GlobalVariable::PrivateLinkage,
Constant::getNullValue(ArrayTy), "__sancov_gen_"); Constant::getNullValue(ArrayTy), "__sancov_gen_");
#if LLVM_VERSION_MAJOR >= 13 #if LLVM_VERSION_MAJOR >= 13
if (TargetTriple.supportsCOMDAT() && if (TargetTriple.supportsCOMDAT() &&

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

@ -544,12 +544,12 @@ static void __afl_map_shm(void) {
if (__afl_map_size && __afl_map_size > MAP_SIZE) { if (__afl_map_size && __afl_map_size > MAP_SIZE) {
u8 *map_env = (u8 *)getenv("AFL_MAP_SIZE"); u8 *map_env = (u8 *)getenv("AFL_MAP_SIZE");
if (!map_env || atoi((char *)map_env) < MAP_SIZE) { if (!map_env || atoi((char *)map_env) < MAP_SIZE) {
fprintf(stderr, "FS_ERROR_MAP_SIZE\n"); fprintf(stderr, "FS_ERROR_MAP_SIZE\n");
send_forkserver_error(FS_ERROR_MAP_SIZE); send_forkserver_error(FS_ERROR_MAP_SIZE);
_exit(1); _exit(1);
} }
@ -561,13 +561,13 @@ static void __afl_map_shm(void) {
if (!__afl_area_ptr || __afl_area_ptr == (void *)-1) { if (!__afl_area_ptr || __afl_area_ptr == (void *)-1) {
if (__afl_map_addr) if (__afl_map_addr)
send_forkserver_error(FS_ERROR_MAP_ADDR); send_forkserver_error(FS_ERROR_MAP_ADDR);
else else
send_forkserver_error(FS_ERROR_SHMAT); send_forkserver_error(FS_ERROR_SHMAT);
perror("shmat for map"); perror("shmat for map");
_exit(1); _exit(1);
} }

2
instrumentation/afl-llvm-lto-instrumentlist.so.cc
View File

@ -45,7 +45,7 @@
#include "llvm/IR/Module.h" #include "llvm/IR/Module.h"
#include "llvm/Pass.h" #include "llvm/Pass.h"
#include "llvm/Support/Debug.h" #include "llvm/Support/Debug.h"
//#include "llvm/Transforms/IPO/PassManagerBuilder.h" // #include "llvm/Transforms/IPO/PassManagerBuilder.h"
#include "llvm/Passes/PassPlugin.h" #include "llvm/Passes/PassPlugin.h"
#include "llvm/Passes/PassBuilder.h" #include "llvm/Passes/PassBuilder.h"
#include "llvm/IR/PassManager.h" #include "llvm/IR/PassManager.h"

4
instrumentation/cmplog-routines-pass.cc
View File

@ -542,7 +542,7 @@ bool CmpLogRoutines::hookRtns(Module &M) {
Value *v1Pcasted = IRB.CreatePointerCast(v1P, i8PtrTy); Value *v1Pcasted = IRB.CreatePointerCast(v1P, i8PtrTy);
Value *v2Pcasted = IRB.CreatePointerCast(v2P, i8PtrTy); Value *v2Pcasted = IRB.CreatePointerCast(v2P, i8PtrTy);
Value *v3Pbitcast = IRB.CreateBitCast( Value *v3Pbitcast = IRB.CreateBitCast(
v3P, IntegerType::get(C, v3P->getType()->getPrimitiveSizeInBits())); v3P, IntegerType::get(C, v3P->getType()->getPrimitiveSizeInBits()));
Value *v3Pcasted = Value *v3Pcasted =
IRB.CreateIntCast(v3Pbitcast, IntegerType::get(C, 64), false); IRB.CreateIntCast(v3Pbitcast, IntegerType::get(C, 64), false);
args.push_back(v1Pcasted); args.push_back(v1Pcasted);
@ -608,7 +608,7 @@ bool CmpLogRoutines::hookRtns(Module &M) {
Value *v1Pcasted = IRB.CreatePointerCast(v1P, i8PtrTy); Value *v1Pcasted = IRB.CreatePointerCast(v1P, i8PtrTy);
Value *v2Pcasted = IRB.CreatePointerCast(v2P, i8PtrTy); Value *v2Pcasted = IRB.CreatePointerCast(v2P, i8PtrTy);
Value *v3Pbitcast = IRB.CreateBitCast( Value *v3Pbitcast = IRB.CreateBitCast(
v3P, IntegerType::get(C, v3P->getType()->getPrimitiveSizeInBits())); v3P, IntegerType::get(C, v3P->getType()->getPrimitiveSizeInBits()));
Value *v3Pcasted = Value *v3Pcasted =
IRB.CreateIntCast(v3Pbitcast, IntegerType::get(C, 64), false); IRB.CreateIntCast(v3Pbitcast, IntegerType::get(C, 64), false);
args.push_back(v1Pcasted); args.push_back(v1Pcasted);

2
instrumentation/compare-transform-pass.so.cc
View File

@ -623,7 +623,7 @@ bool CompareTransform::transformCmps(Module &M, const bool processStrcmp,
IRBuilder<> cur_lenchk_IRB(&*(cur_lenchk_bb->getFirstInsertionPt())); IRBuilder<> cur_lenchk_IRB(&*(cur_lenchk_bb->getFirstInsertionPt()));
Value *icmp = cur_lenchk_IRB.CreateICmpEQ( Value *icmp = cur_lenchk_IRB.CreateICmpEQ(
sizedValue, ConstantInt::get(sizedValue->getType(), i)); sizedValue, ConstantInt::get(sizedValue->getType(), i));
cur_lenchk_IRB.CreateCondBr(icmp, end_bb, cur_cmp_bb); cur_lenchk_IRB.CreateCondBr(icmp, end_bb, cur_cmp_bb);
cur_lenchk_bb->getTerminator()->eraseFromParent(); cur_lenchk_bb->getTerminator()->eraseFromParent();

2
instrumentation/split-compares-pass.so.cc
View File

@ -60,7 +60,7 @@ using namespace llvm;
// uncomment this toggle function verification at each step. horribly slow, but // uncomment this toggle function verification at each step. horribly slow, but
// helps to pinpoint a potential problem in the splitting code. // helps to pinpoint a potential problem in the splitting code.
//#define VERIFY_TOO_MUCH 1 // #define VERIFY_TOO_MUCH 1
namespace { namespace {

6
qemu_mode/libcompcov/libcompcov.so.c
View File

@ -68,7 +68,11 @@ static int debug_fd = -1;
#define MAX_MAPPINGS 1024 #define MAX_MAPPINGS 1024
static struct mapping { void *st, *en; } __compcov_ro[MAX_MAPPINGS]; static struct mapping {
void *st, *en;
} __compcov_ro[MAX_MAPPINGS];
static u32 __compcov_ro_cnt; static u32 __compcov_ro_cnt;

8
src/afl-cc.c
View File

@ -933,10 +933,10 @@ static void edit_params(u32 argc, char **argv, char **envp) {
} }
//#if LLVM_MAJOR >= 13 // #if LLVM_MAJOR >= 13
// // Use the old pass manager in LLVM 14 which the AFL++ passes still // // Use the old pass manager in LLVM 14 which the AFL++ passes still
// use. cc_params[cc_par_cnt++] = "-flegacy-pass-manager"; // use. cc_params[cc_par_cnt++] = "-flegacy-pass-manager";
//#endif // #endif
if (lto_mode && !have_c) { if (lto_mode && !have_c) {

32
src/afl-fuzz-redqueen.c
View File

@ -28,8 +28,8 @@
#include "afl-fuzz.h" #include "afl-fuzz.h"
#include "cmplog.h" #include "cmplog.h"
//#define _DEBUG // #define _DEBUG
//#define CMPLOG_INTROSPECTION // #define CMPLOG_INTROSPECTION
// CMP attribute enum // CMP attribute enum
enum { enum {
@ -571,7 +571,7 @@ static u8 its_fuzz(afl_state_t *afl, u8 *buf, u32 len, u8 *status) {
} }
//#ifdef CMPLOG_SOLVE_TRANSFORM // #ifdef CMPLOG_SOLVE_TRANSFORM
static int strntoll(const char *str, size_t sz, char **end, int base, static int strntoll(const char *str, size_t sz, char **end, int base,
long long *out) { long long *out) {
@ -771,7 +771,7 @@ static void to_base64(u8 *src, u8 *dst, u32 dst_len) {
#endif #endif
//#endif // #endif
static u8 cmp_extend_encoding(afl_state_t *afl, struct cmp_header *h, static u8 cmp_extend_encoding(afl_state_t *afl, struct cmp_header *h,
u64 pattern, u64 repl, u64 o_pattern, u64 pattern, u64 repl, u64 o_pattern,
@ -803,8 +803,8 @@ static u8 cmp_extend_encoding(afl_state_t *afl, struct cmp_header *h,
// o_pattern, pattern, repl, changed_val, idx, taint_len, // o_pattern, pattern, repl, changed_val, idx, taint_len,
// hshape, attr); // hshape, attr);
//#ifdef CMPLOG_SOLVE_TRANSFORM // #ifdef CMPLOG_SOLVE_TRANSFORM
// reverse atoi()/strnu?toll() is expensive, so we only to it in lvl 3 // reverse atoi()/strnu?toll() is expensive, so we only to it in lvl 3
if (afl->cmplog_enable_transform && (lvl & LVL3)) { if (afl->cmplog_enable_transform && (lvl & LVL3)) {
u8 *endptr; u8 *endptr;
@ -1120,7 +1120,7 @@ static u8 cmp_extend_encoding(afl_state_t *afl, struct cmp_header *h,
} }
//#endif // #endif
// we only allow this for ascii2integer (above) so leave if this is the case // we only allow this for ascii2integer (above) so leave if this is the case
if (unlikely(pattern == o_pattern)) { return 0; } if (unlikely(pattern == o_pattern)) { return 0; }
@ -1275,7 +1275,7 @@ static u8 cmp_extend_encoding(afl_state_t *afl, struct cmp_header *h,
// 16 = modified float, 32 = modified integer (modified = wont match // 16 = modified float, 32 = modified integer (modified = wont match
// in original buffer) // in original buffer)
//#ifdef CMPLOG_SOLVE_ARITHMETIC // #ifdef CMPLOG_SOLVE_ARITHMETIC
if (!afl->cmplog_enable_arith || lvl < LVL3 || attr == IS_TRANSFORM) { if (!afl->cmplog_enable_arith || lvl < LVL3 || attr == IS_TRANSFORM) {
return 0; return 0;
@ -1440,8 +1440,8 @@ static u8 cmp_extend_encoding(afl_state_t *afl, struct cmp_header *h,
} }
//#endif /* // #endif /*
// CMPLOG_SOLVE_ARITHMETIC // CMPLOG_SOLVE_ARITHMETIC
return 0; return 0;
@ -1948,9 +1948,9 @@ static u8 rtn_extend_encoding(afl_state_t *afl, u8 entry,
#ifndef CMPLOG_COMBINE #ifndef CMPLOG_COMBINE
(void)(cbuf); (void)(cbuf);
#endif #endif
//#ifndef CMPLOG_SOLVE_TRANSFORM // #ifndef CMPLOG_SOLVE_TRANSFORM
// (void)(changed_val); // (void)(changed_val);
//#endif // #endif
if (afl->fsrv.total_execs - last_update > screen_update) { if (afl->fsrv.total_execs - last_update > screen_update) {
@ -2418,7 +2418,7 @@ static u8 rtn_extend_encoding(afl_state_t *afl, u8 entry,
} }
//#endif // #endif
return 0; return 0;
@ -2818,9 +2818,9 @@ u8 input_to_state_stage(afl_state_t *afl, u8 *orig_buf, u8 *buf, u32 len) {
} else if ((lvl & LVL1) } else if ((lvl & LVL1)
//#ifdef CMPLOG_SOLVE_TRANSFORM // #ifdef CMPLOG_SOLVE_TRANSFORM
|| ((lvl & LVL3) && afl->cmplog_enable_transform) || ((lvl & LVL3) && afl->cmplog_enable_transform)
//#endif // #endif
) { ) {
if (unlikely(rtn_fuzz(afl, k, orig_buf, buf, cbuf, len, lvl, taint))) { if (unlikely(rtn_fuzz(afl, k, orig_buf, buf, cbuf, len, lvl, taint))) {

2
utils/afl_untracer/afl-untracer.c
View File

@ -288,7 +288,7 @@ library_list_t *find_library(char *name) {
#pragma GCC optimize("O0") #pragma GCC optimize("O0")
void breakpoint(void) { void breakpoint(void) {
if (debug) fprintf(stderr, "Breakpoint function \"breakpoint\" reached.\n"); if (debug) fprintf(stderr, "Breakpoint function \"breakpoint\" reached.\n");
} }

6
utils/libtokencap/libtokencap.so.c
View File

@ -81,7 +81,11 @@ void *(*__libc_memmem)(const void *haystack, size_t haystack_len,
#define MAX_MAPPINGS 1024 #define MAX_MAPPINGS 1024
static struct mapping { void *st, *en; } __tokencap_ro[MAX_MAPPINGS]; static struct mapping {
void *st, *en;
} __tokencap_ro[MAX_MAPPINGS];
static u32 __tokencap_ro_cnt; static u32 __tokencap_ro_cnt;
static u8 __tokencap_ro_loaded; static u8 __tokencap_ro_loaded;

3
utils/socket_fuzzing/socketfuzz.c
View File

@ -23,7 +23,8 @@
#include <errno.h> #include <errno.h>
#include <stdio.h> #include <stdio.h>
#include <poll.h> #include <poll.h>
//#include "logging.h" // switche from preeny_info() to fprintf(stderr, "Info: " // #include "logging.h" // switched from preeny_info() to fprintf(stderr, "Info:
// "
// //
// originals // originals