mirror of
https://github.com/AFLplusplus/AFLplusplus.git
synced 2025-06-13 10:38:07 +00:00
* sync (#886) * Create FUNDING.yml * Update FUNDING.yml * moved custom_mutator examples * unicorn speedtest makefile cleanup * fixed example location * fix qdbi * update util readme * Frida persistent (#880) * Added x64 support for persistent mode (function call only), in-memory teest cases and complog * Review changes, fix NeverZero and code to parse the .text section of the main executable. Excluded ranges TBC * Various minor fixes and finished support for AFL_INST_LIBS * Review changes Co-authored-by: Your Name <you@example.com> * nits * fix frida mode * Integer overflow/underflow fixes in libdislocator (#889) * libdislocator: fixing integer overflow in 'max_mem' variable and setting 'max_mem' type to 'size_t' * libdislocator: fixing potential integer underflow in 'total_mem' variable due to its different values in different threads * Bumped warnings up to the max and fixed remaining issues (#890) Co-authored-by: Your Name <you@example.com> * nits * frida mode - support non-pie * nits * nit * update grammar mutator * Fixes for aarch64, OSX and other minor issues (#891) Co-authored-by: Your Name <you@example.com> * nits * nits * fix PCGUARD, build aflpp_driver with fPIC * Added representative fuzzbench test and test for libxml (#893) * Added representative fuzzbench test and test for libxml * Added support for building FRIDA from source with FRIDA_SOURCE=1 Co-authored-by: Your Name <you@example.com> * nits * update changelog * typos * fixed potential double free in custom trim (#881) * error handling, freeing mem * frida: complog -> cmplog * fix statsd writing * let aflpp_qemu_driver_hook.so build fail gracefully * fix stdin trimming * Support for AFL_ENTRYPOINT (#898) Co-authored-by: Your Name <you@example.com> * remove the input file .cur_input at the end of the fuzzing, if AFL_TMPDIR is used * reverse push (#901) * Create FUNDING.yml * Update FUNDING.yml * disable QEMU static pie Co-authored-by: Andrea Fioraldi <andreafioraldi@gmail.com> * clarify that no modifications are required. * add new test for frida_mode (please review) * typos * fix persistent mode (64-bit) * set ARCH for linux intel 32-bit for frida-gum-devkit * prepare for 32-bit support (later) * not on qemu 3 anymore * unicorn mips fixes * instrumentation further move to C++11 (#900) * unicorn fixes * more unicorn fixes * Fix memory errors when trim causes testcase growth (#881) (#903) * Revert "fixed potential double free in custom trim (#881)" This reverts commite9d2f72382
. * Revert "fix custom trim for increasing data" This reverts commit86a8ef168d
. * Fix memory errors when trim causes testcase growth Modify trim_case_custom to avoid writing into in_buf because some custom mutators can cause the testcase to grow rather than shrink. Instead of modifying in_buf directly, we write the update out to the disk when trimming is complete, and then the caller is responsible for refreshing the in-memory buffer from the file. This is still a bit sketchy because it does need to modify q->len in order to notify the upper layers that something changed, and it could end up telling upper layer code that the q->len is *bigger* than the buffer (q->testcase_buf) that contains it, which is asking for trouble down the line somewhere... * Fix an unlikely situation Put back some `unlikely()` calls that were in thee9d2f72382
commit that was reverted. * typo * Exit on time (#904) * Variable AFL_EXIT_ON_TIME description has been added. Variables AFL_EXIT_ON_TIME and afl_exit_on_time has been added. afl->exit_on_time variable initialization has been added. The asignment of a value to the afl->afl_env.afl_exit_on_time variable from environment variables has been added. Code to exit on timeout if new path not found has been added. * Type of afl_exit_on_time variable has been changed. Variable exit_on_time has been added to the afl_state_t structure. * Command `export AFL_EXIT_WHEN_DONE=1` has been added. * Millisecond to second conversion has been added. Call get_cur_time() has been added. * Revert to using the saved current time value. * Useless check has been removed. * fix new path to custom-mutators * ensure crashes/README.txt exists * fix * Changes to bump FRIDA version and to clone FRIDA repo in to build directory rather than use a submodule as the FRIDA build scripts don't like it (#906) Co-authored-by: Your Name <you@example.com> * Fix numeric overflow in cmplog implementation (#907) Co-authored-by: Your Name <you@example.com> * testcase fixes for unicorn * remove merge conflict artifacts * fix afl-plot * Changes to remove binaries from frida_mode (#913) Co-authored-by: Your Name <you@example.com> * Frida cmplog fail fast (#914) * Changes to remove binaries from frida_mode * Changes to make cmplog fail fast Co-authored-by: Your Name <you@example.com> * afl-plot: relative time * arch linux and mac os support for afl-system-config * typo * code-format * update documentation Co-authored-by: Dominik Maier <domenukk@gmail.com> Co-authored-by: WorksButNotTested <62701594+WorksButNotTested@users.noreply.github.com> Co-authored-by: Your Name <you@example.com> Co-authored-by: Dmitry Zheregelya <zheregelya.d@gmail.com> Co-authored-by: hexcoder <hexcoder-@users.noreply.github.com> Co-authored-by: hexcoder- <heiko@hexco.de> Co-authored-by: Andrea Fioraldi <andreafioraldi@gmail.com> Co-authored-by: David CARLIER <devnexen@gmail.com> Co-authored-by: realmadsci <71108352+realmadsci@users.noreply.github.com> Co-authored-by: Roman M. Iudichev <SecNotice@ya.ru>
252 lines
5.5 KiB
C++
Executable File
252 lines
5.5 KiB
C++
Executable File
#include <iostream>
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <sys/mman.h>
|
|
#include <sys/wait.h>
|
|
#include <fcntl.h>
|
|
#include <dlfcn.h>
|
|
|
|
#ifdef __ANDROID__
|
|
#include "../include/android-ashmem.h"
|
|
#endif
|
|
|
|
#include <sys/ipc.h>
|
|
#include <sys/shm.h>
|
|
#include "../config.h"
|
|
|
|
#include <QBDI.h>
|
|
|
|
/* NeverZero */
|
|
|
|
#if (defined(__x86_64__) || defined(__i386__)) && defined(AFL_QEMU_NOT_ZERO)
|
|
#define INC_AFL_AREA(loc) \
|
|
asm volatile( \
|
|
"addb $1, (%0, %1, 1)\n" \
|
|
"adcb $0, (%0, %1, 1)\n" \
|
|
: /* no out */ \
|
|
: "r"(afl_area_ptr), "r"(loc) \
|
|
: "memory", "eax")
|
|
#else
|
|
#define INC_AFL_AREA(loc) afl_area_ptr[loc]++
|
|
#endif
|
|
|
|
using namespace QBDI;
|
|
|
|
typedef int (*target_func)(char *buf, int size);
|
|
|
|
static const size_t STACK_SIZE = 0x100000; // 1MB
|
|
static const QBDI::rword FAKE_RET_ADDR = 0x40000;
|
|
target_func p_target_func = NULL;
|
|
rword module_base = 0;
|
|
rword module_end = 0;
|
|
static unsigned char
|
|
dummy[MAP_SIZE]; /* costs MAP_SIZE but saves a few instructions */
|
|
unsigned char *afl_area_ptr = NULL; /* Exported for afl_gen_trace */
|
|
|
|
unsigned long afl_prev_loc = 0;
|
|
|
|
char input_pathname[PATH_MAX];
|
|
|
|
/* Set up SHM region and initialize other stuff. */
|
|
|
|
int afl_setup(void) {
|
|
|
|
char *id_str = getenv(SHM_ENV_VAR);
|
|
int shm_id;
|
|
if (id_str) {
|
|
|
|
shm_id = atoi(id_str);
|
|
afl_area_ptr = (unsigned char *)shmat(shm_id, NULL, 0);
|
|
if (afl_area_ptr == (void *)-1) return 0;
|
|
memset(afl_area_ptr, 0, MAP_SIZE);
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
/* Fork server logic, invoked once we hit _start. */
|
|
static void afl_forkserver() {
|
|
|
|
static unsigned char tmp[4];
|
|
pid_t child_pid;
|
|
|
|
if (write(FORKSRV_FD + 1, tmp, 4) != 4) return;
|
|
|
|
while (1) {
|
|
|
|
int status;
|
|
u32 was_killed;
|
|
// wait for afl-fuzz
|
|
if (read(FORKSRV_FD, &was_killed, 4) != 4) exit(2);
|
|
|
|
child_pid = fork();
|
|
if (child_pid < 0) exit(4);
|
|
|
|
if (!child_pid) {
|
|
|
|
// child return to execute code
|
|
close(FORKSRV_FD);
|
|
close(FORKSRV_FD + 1);
|
|
return;
|
|
|
|
}
|
|
|
|
// write child pid to afl-fuzz
|
|
if (write(FORKSRV_FD + 1, &child_pid, 4) != 4) exit(5);
|
|
|
|
// wait child stop
|
|
if (waitpid(child_pid, &status, 0) < 0) exit(6);
|
|
|
|
// send child stop status to afl-fuzz
|
|
if (write(FORKSRV_FD + 1, &status, 4) != 4) exit(7);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
void afl_maybe_log(unsigned long cur_loc) {
|
|
|
|
if (afl_area_ptr == NULL) { return; }
|
|
unsigned long afl_idx = cur_loc ^ afl_prev_loc;
|
|
afl_idx &= MAP_SIZE - 1;
|
|
INC_AFL_AREA(afl_idx);
|
|
afl_prev_loc = cur_loc >> 1;
|
|
|
|
}
|
|
|
|
char *read_file(char *path, unsigned long *length) {
|
|
|
|
unsigned long len;
|
|
char * buf;
|
|
|
|
FILE *fp = fopen(path, "rb");
|
|
fseek(fp, 0, SEEK_END);
|
|
len = ftell(fp);
|
|
buf = (char *)malloc(len);
|
|
rewind(fp);
|
|
fread(buf, 1, len, fp);
|
|
fclose(fp);
|
|
*length = len;
|
|
return buf;
|
|
|
|
}
|
|
|
|
QBDI_NOINLINE int fuzz_func() {
|
|
|
|
if (afl_setup()) { afl_forkserver(); }
|
|
|
|
unsigned long len = 0;
|
|
char * data = read_file(input_pathname, &len);
|
|
|
|
// printf("In fuzz_func\n");
|
|
p_target_func(data, len);
|
|
return 1;
|
|
|
|
}
|
|
|
|
static QBDI::VMAction bbcallback(QBDI::VMInstanceRef vm,
|
|
const QBDI::VMState *state,
|
|
QBDI::GPRState * gprState,
|
|
QBDI::FPRState *fprState, void *data) {
|
|
|
|
// errno = SAVED_ERRNO;
|
|
|
|
#ifdef __x86_64__
|
|
unsigned long pc = gprState->rip;
|
|
#elif defined(i386)
|
|
unsigned long pc = gprState->eip;
|
|
#elif defined(__arm__)
|
|
unsigned long pc = gprState->pc;
|
|
#endif
|
|
|
|
// just log the module path
|
|
if (pc >= module_base && pc <= module_end) {
|
|
|
|
unsigned long offset = pc - module_base;
|
|
printf("\toffset:%p\n", offset);
|
|
afl_maybe_log(offset);
|
|
|
|
}
|
|
|
|
return QBDI::VMAction::CONTINUE;
|
|
|
|
}
|
|
|
|
int main(int argc, char **argv) {
|
|
|
|
if (argc < 3) {
|
|
|
|
puts("usage: ./loader library_path input_file_path");
|
|
exit(0);
|
|
|
|
}
|
|
|
|
const char *lib_path;
|
|
lib_path = argv[1];
|
|
strcpy(input_pathname, argv[2]);
|
|
void *handle = dlopen(lib_path, RTLD_LAZY);
|
|
|
|
if (handle == nullptr) {
|
|
|
|
perror("Cannot load library");
|
|
exit(EXIT_FAILURE);
|
|
|
|
}
|
|
|
|
const char *lib_name = lib_path;
|
|
if (strrchr(lib_name, '/') != nullptr) lib_name = strrchr(lib_name, '/') + 1;
|
|
|
|
// printf("library name:%s\n", lib_name);
|
|
// load library module address for log path
|
|
for (MemoryMap &map : getCurrentProcessMaps()) {
|
|
|
|
// printf("module:%s\n", map.name.c_str());
|
|
if ((map.permission & PF_EXEC) &&
|
|
strstr(map.name.c_str(), lib_name) != NULL) {
|
|
|
|
module_base = map.range.start;
|
|
module_end = map.range.end;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (module_base == 0) {
|
|
|
|
std::cerr << "Fail to find base address" << std::endl;
|
|
return -1;
|
|
|
|
}
|
|
|
|
// printf("module base:%p, module end:%p\n", module_base, module_end);
|
|
p_target_func = (target_func)dlsym(handle, "target_func");
|
|
// p_target_func = (target_func)(module_base + 0x61a);
|
|
printf("p_target_func:%p\n", p_target_func);
|
|
|
|
VM vm;
|
|
uint8_t *fakestack = nullptr;
|
|
|
|
GPRState *state = vm.getGPRState();
|
|
allocateVirtualStack(state, STACK_SIZE, &fakestack);
|
|
vm.addInstrumentedModuleFromAddr(module_base);
|
|
vm.addInstrumentedModuleFromAddr((rword)&main);
|
|
|
|
vm.addVMEventCB(BASIC_BLOCK_ENTRY, bbcallback, nullptr);
|
|
|
|
// QBDI::simulateCall(state, FAKE_RET_ADDR);
|
|
// vm.run((rword)&fuzz_func, (rword)FAKE_RET_ADDR);
|
|
|
|
rword ret;
|
|
vm.call(&ret, (rword)&fuzz_func, {});
|
|
|
|
return 0;
|
|
|
|
}
|
|
|