ExternalVendorCode/AFLplusplus
1
0
Fork 0
mirror of https://github.com/AFLplusplus/AFLplusplus.git synced 2025-06-10 17:21:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Suppress spurious output

Browse Source
This commit is contained in:
Your Name 2021-11-09 18:29:25 +00:00
parent 8578b6b01c
commit 02e8919cbc
51 changed files with 367 additions and 387 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
frida_mode/include/util.h
View File

@ -3,12 +3,38 @@
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "debug.h"
#define UNUSED_PARAMETER(x) (void)(x) #define UNUSED_PARAMETER(x) (void)(x)
#define IGNORED_RETURN(x) (void)!(x) #define IGNORED_RETURN(x) (void)!(x)
guint64 util_read_address(char *key); guint64 util_read_address(char *key);
guint64 util_read_num(char *key); guint64 util_read_num(char *key);
gboolean util_output_enabled(void);
#define FOKF(x...) \
do { \
\
if (!util_output_enabled()) { break; } \
\
OKF(x); \
\
} while (0)
#define FWARNF(x...) \
do { \
\
WARNF(x); \
\
} while (0)
#define FFATAL(x...) \
do { \
\
FATAL(x); \
\
} while (0)
#endif #endif

7
frida_mode/src/asan/asan.c
View File

@ -1,8 +1,7 @@
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "debug.h"
#include "asan.h" #include "asan.h"
#include "util.h"
static gboolean asan_enabled = FALSE; static gboolean asan_enabled = FALSE;
gboolean asan_initialized = FALSE; gboolean asan_initialized = FALSE;
@ -11,12 +10,12 @@ void asan_config(void) {
if (getenv("AFL_USE_FASAN") != NULL) { if (getenv("AFL_USE_FASAN") != NULL) {
OKF("Frida ASAN mode enabled"); FOKF("Frida ASAN mode enabled");
asan_enabled = TRUE; asan_enabled = TRUE;
} else { } else {
OKF("Frida ASAN mode disabled"); FOKF("Frida ASAN mode disabled");
} }

6
frida_mode/src/asan/asan_arm32.c
View File

@ -1,7 +1,5 @@
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "debug.h"
#include "asan.h" #include "asan.h"
#include "util.h" #include "util.h"
@ -12,7 +10,7 @@ void asan_instrument(const cs_insn *instr, GumStalkerIterator *iterator) {
UNUSED_PARAMETER(iterator); UNUSED_PARAMETER(iterator);
if (asan_initialized) { if (asan_initialized) {
FATAL("ASAN mode not supported on this architecture"); FFATAL("ASAN mode not supported on this architecture");
} }
@ -20,7 +18,7 @@ void asan_instrument(const cs_insn *instr, GumStalkerIterator *iterator) {
void asan_arch_init(void) { void asan_arch_init(void) {
FATAL("ASAN mode not supported on this architecture"); FFATAL("ASAN mode not supported on this architecture");
} }

4
frida_mode/src/asan/asan_arm64.c
View File

@ -1,8 +1,6 @@
#include <dlfcn.h> #include <dlfcn.h>
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "debug.h"
#include "asan.h" #include "asan.h"
#include "ctx.h" #include "ctx.h"
#include "util.h" #include "util.h"
@ -86,7 +84,7 @@ void asan_arch_init(void) {
asan_storeN = (asan_loadN_t)dlsym(RTLD_DEFAULT, "__asan_storeN"); asan_storeN = (asan_loadN_t)dlsym(RTLD_DEFAULT, "__asan_storeN");
if (asan_loadN == NULL || asan_storeN == NULL) { if (asan_loadN == NULL || asan_storeN == NULL) {
FATAL("Frida ASAN failed to find '__asan_loadN' or '__asan_storeN'"); FFATAL("Frida ASAN failed to find '__asan_loadN' or '__asan_storeN'");
} }

4
frida_mode/src/asan/asan_x64.c
View File

@ -1,8 +1,6 @@
#include <dlfcn.h> #include <dlfcn.h>
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "debug.h"
#include "asan.h" #include "asan.h"
#include "ctx.h" #include "ctx.h"
#include "util.h" #include "util.h"
@ -83,7 +81,7 @@ void asan_arch_init(void) {
asan_storeN = (asan_loadN_t)dlsym(RTLD_DEFAULT, "__asan_storeN"); asan_storeN = (asan_loadN_t)dlsym(RTLD_DEFAULT, "__asan_storeN");
if (asan_loadN == NULL || asan_storeN == NULL) { if (asan_loadN == NULL || asan_storeN == NULL) {
FATAL("Frida ASAN failed to find '__asan_loadN' or '__asan_storeN'"); FFATAL("Frida ASAN failed to find '__asan_loadN' or '__asan_storeN'");
} }

4
frida_mode/src/asan/asan_x86.c
View File

@ -1,8 +1,6 @@
#include <dlfcn.h> #include <dlfcn.h>
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "debug.h"
#include "asan.h" #include "asan.h"
#include "ctx.h" #include "ctx.h"
#include "util.h" #include "util.h"
@ -83,7 +81,7 @@ void asan_arch_init(void) {
asan_storeN = (asan_loadN_t)dlsym(RTLD_DEFAULT, "__asan_storeN"); asan_storeN = (asan_loadN_t)dlsym(RTLD_DEFAULT, "__asan_storeN");
if (asan_loadN == NULL || asan_storeN == NULL) { if (asan_loadN == NULL || asan_storeN == NULL) {
FATAL("Frida ASAN failed to find '__asan_loadN' or '__asan_storeN'"); FFATAL("Frida ASAN failed to find '__asan_loadN' or '__asan_storeN'");
} }

18
frida_mode/src/cmplog/cmplog.c
View File

@ -7,8 +7,6 @@
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "debug.h"
#include "util.h" #include "util.h"
#define DEFAULT_MMAP_MIN_ADDR (32UL << 10) #define DEFAULT_MMAP_MIN_ADDR (32UL << 10)
@ -42,7 +40,7 @@ static gint cmplog_sort(gconstpointer a, gconstpointer b) {
static void cmplog_get_ranges(void) { static void cmplog_get_ranges(void) {
OKF("CMPLOG - Collecting ranges"); FOKF("CMPLOG - Collecting ranges");
cmplog_ranges = g_array_sized_new(false, false, sizeof(GumMemoryRange), 100); cmplog_ranges = g_array_sized_new(false, false, sizeof(GumMemoryRange), 100);
gum_process_enumerate_ranges(GUM_PAGE_READ, cmplog_range, cmplog_ranges); gum_process_enumerate_ranges(GUM_PAGE_READ, cmplog_range, cmplog_ranges);
@ -56,7 +54,7 @@ void cmplog_config(void) {
void cmplog_init(void) { void cmplog_init(void) {
OKF("CMPLOG - Enabled [%c]", __afl_cmp_map == NULL ? ' ' : 'X'); FOKF("CMPLOG - Enabled [%c]", __afl_cmp_map == NULL ? ' ' : 'X');
if (__afl_cmp_map == NULL) { return; } if (__afl_cmp_map == NULL) { return; }
@ -65,7 +63,7 @@ void cmplog_init(void) {
for (guint i = 0; i < cmplog_ranges->len; i++) { for (guint i = 0; i < cmplog_ranges->len; i++) {
GumMemoryRange *range = &g_array_index(cmplog_ranges, GumMemoryRange, i); GumMemoryRange *range = &g_array_index(cmplog_ranges, GumMemoryRange, i);
OKF("CMPLOG Range - %3u: 0x%016" G_GINT64_MODIFIER FOKF("CMPLOG Range - %3u: 0x%016" G_GINT64_MODIFIER
"X - 0x%016" G_GINT64_MODIFIER "X", "X - 0x%016" G_GINT64_MODIFIER "X",
i, range->base_address, range->base_address + range->size); i, range->base_address, range->base_address + range->size);
@ -78,14 +76,14 @@ void cmplog_init(void) {
hash_yes = g_hash_table_new(g_direct_hash, g_direct_equal); hash_yes = g_hash_table_new(g_direct_hash, g_direct_equal);
if (hash_yes == NULL) { if (hash_yes == NULL) {
FATAL("Failed to g_hash_table_new, errno: %d", errno); FFATAL("Failed to g_hash_table_new, errno: %d", errno);
} }
hash_no = g_hash_table_new(g_direct_hash, g_direct_equal); hash_no = g_hash_table_new(g_direct_hash, g_direct_equal);
if (hash_no == NULL) { if (hash_no == NULL) {
FATAL("Failed to g_hash_table_new, errno: %d", errno); FFATAL("Failed to g_hash_table_new, errno: %d", errno);
} }
@ -117,7 +115,7 @@ gboolean cmplog_test_addr(guint64 addr, size_t size) {
if (!g_hash_table_add(hash_no, GSIZE_TO_POINTER(addr))) { if (!g_hash_table_add(hash_no, GSIZE_TO_POINTER(addr))) {
FATAL("Failed - g_hash_table_add"); FFATAL("Failed - g_hash_table_add");
} }
@ -127,7 +125,7 @@ gboolean cmplog_test_addr(guint64 addr, size_t size) {
if (!g_hash_table_add(hash_yes, GSIZE_TO_POINTER(addr))) { if (!g_hash_table_add(hash_yes, GSIZE_TO_POINTER(addr))) {
FATAL("Failed - g_hash_table_add"); FFATAL("Failed - g_hash_table_add");
} }
@ -139,7 +137,7 @@ gboolean cmplog_test_addr(guint64 addr, size_t size) {
gboolean cmplog_is_readable(guint64 addr, size_t size) { gboolean cmplog_is_readable(guint64 addr, size_t size) {
if (cmplog_ranges == NULL) FATAL("CMPLOG not initialized"); if (cmplog_ranges == NULL) FFATAL("CMPLOG not initialized");
/* /*
* The Linux kernel prevents mmap from allocating from the very bottom of the * The Linux kernel prevents mmap from allocating from the very bottom of the

4
frida_mode/src/cmplog/cmplog_arm32.c
View File

@ -1,7 +1,5 @@
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "debug.h"
#include "frida_cmplog.h" #include "frida_cmplog.h"
#include "util.h" #include "util.h"
@ -11,7 +9,7 @@ void cmplog_instrument(const cs_insn *instr, GumStalkerIterator *iterator) {
UNUSED_PARAMETER(instr); UNUSED_PARAMETER(instr);
UNUSED_PARAMETER(iterator); UNUSED_PARAMETER(iterator);
if (__afl_cmp_map == NULL) { return; } if (__afl_cmp_map == NULL) { return; }
FATAL("CMPLOG mode not supported on this architecture"); FFATAL("CMPLOG mode not supported on this architecture");
} }

6
frida_mode/src/cmplog/cmplog_arm64.c
View File

@ -67,7 +67,7 @@ static gboolean cmplog_read_mem(GumCpuContext *ctx, uint8_t size,
*val = *((guint64 *)GSIZE_TO_POINTER(address)); *val = *((guint64 *)GSIZE_TO_POINTER(address));
return TRUE; return TRUE;
default: default:
FATAL("Invalid operand size: %d\n", size); FFATAL("Invalid operand size: %d\n", size);
} }
@ -89,7 +89,7 @@ static gboolean cmplog_get_operand_value(GumCpuContext *context,
case ARM64_OP_MEM: case ARM64_OP_MEM:
return cmplog_read_mem(context, ctx->size, &ctx->mem, val); return cmplog_read_mem(context, ctx->size, &ctx->mem, val);
default: default:
FATAL("Invalid operand type: %d\n", ctx->type); FFATAL("Invalid operand type: %d\n", ctx->type);
} }
@ -163,7 +163,7 @@ static void cmplog_instrument_put_operand(cmplog_ctx_t *ctx,
gum_memcpy(&ctx->mem, &operand->mem, sizeof(arm64_op_mem)); gum_memcpy(&ctx->mem, &operand->mem, sizeof(arm64_op_mem));
break; break;
default: default:
FATAL("Invalid operand type: %d\n", operand->type); FFATAL("Invalid operand type: %d\n", operand->type);
} }

6
frida_mode/src/cmplog/cmplog_x64.c
View File

@ -62,7 +62,7 @@ static gboolean cmplog_read_mem(GumCpuContext *ctx, uint8_t size,
*val = *((guint64 *)GSIZE_TO_POINTER(address)); *val = *((guint64 *)GSIZE_TO_POINTER(address));
return TRUE; return TRUE;
default: default:
FATAL("Invalid operand size: %d\n", size); FFATAL("Invalid operand size: %d\n", size);
} }
@ -84,7 +84,7 @@ static gboolean cmplog_get_operand_value(GumCpuContext *context,
case X86_OP_MEM: case X86_OP_MEM:
return cmplog_read_mem(context, ctx->size, &ctx->mem, val); return cmplog_read_mem(context, ctx->size, &ctx->mem, val);
default: default:
FATAL("Invalid operand type: %d\n", ctx->type); FFATAL("Invalid operand type: %d\n", ctx->type);
} }
@ -157,7 +157,7 @@ static void cmplog_instrument_put_operand(cmplog_ctx_t *ctx,
gum_memcpy(&ctx->mem, &operand->mem, sizeof(x86_op_mem)); gum_memcpy(&ctx->mem, &operand->mem, sizeof(x86_op_mem));
break; break;
default: default:
FATAL("Invalid operand type: %d\n", operand->type); FFATAL("Invalid operand type: %d\n", operand->type);
} }

8
frida_mode/src/cmplog/cmplog_x86.c
View File

@ -59,7 +59,7 @@ static gboolean cmplog_read_mem(GumCpuContext *ctx, uint8_t size,
*val = *((guint32 *)GSIZE_TO_POINTER(address)); *val = *((guint32 *)GSIZE_TO_POINTER(address));
return TRUE; return TRUE;
default: default:
FATAL("Invalid operand size: %d\n", size); FFATAL("Invalid operand size: %d\n", size);
} }
@ -81,7 +81,7 @@ static gboolean cmplog_get_operand_value(GumCpuContext *context,
case X86_OP_MEM: case X86_OP_MEM:
return cmplog_read_mem(context, ctx->size, &ctx->mem, val); return cmplog_read_mem(context, ctx->size, &ctx->mem, val);
default: default:
FATAL("Invalid operand type: %d\n", ctx->type); FFATAL("Invalid operand type: %d\n", ctx->type);
} }
@ -162,7 +162,7 @@ static void cmplog_instrument_put_operand(cmplog_ctx_t *ctx,
gum_memcpy(&ctx->mem, &operand->mem, sizeof(x86_op_mem)); gum_memcpy(&ctx->mem, &operand->mem, sizeof(x86_op_mem));
break; break;
default: default:
FATAL("Invalid operand type: %d\n", operand->type); FFATAL("Invalid operand type: %d\n", operand->type);
} }
@ -228,7 +228,7 @@ static void cmplog_cmp_sub_callout(GumCpuContext *context, gpointer user_data) {
gsize operand1; gsize operand1;
gsize operand2; gsize operand2;
if (ctx->operand1.size != ctx->operand2.size) FATAL("Operand size mismatch"); if (ctx->operand1.size != ctx->operand2.size) FFATAL("Operand size mismatch");
if (!cmplog_get_operand_value(context, &ctx->operand1, &operand1)) { return; } if (!cmplog_get_operand_value(context, &ctx->operand1, &operand1)) { return; }
if (!cmplog_get_operand_value(context, &ctx->operand2, &operand2)) { return; } if (!cmplog_get_operand_value(context, &ctx->operand2, &operand2)) { return; }

4
frida_mode/src/ctx/ctx_arm32.c
View File

@ -1,14 +1,12 @@
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "debug.h"
#include "ctx.h" #include "ctx.h"
#if defined(__arm__) #if defined(__arm__)
gsize ctx_read_reg(GumArmCpuContext *ctx, arm_reg reg) { gsize ctx_read_reg(GumArmCpuContext *ctx, arm_reg reg) {
FATAL("ctx_read_reg unimplemented for this architecture"); FFATAL("ctx_read_reg unimplemented for this architecture");
} }

12
frida_mode/src/ctx/ctx_arm64.c
View File

@ -1,7 +1,5 @@
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "debug.h"
#include "ctx.h" #include "ctx.h"
#if defined(__aarch64__) #if defined(__aarch64__)
@ -174,7 +172,7 @@ gsize ctx_read_reg(GumArm64CpuContext *ctx, arm64_reg reg) {
ARM64_REG_64(ARM64_REG_SP, ctx->sp) ARM64_REG_64(ARM64_REG_SP, ctx->sp)
default: default:
FATAL("Failed to read register: %d", reg); FFATAL("Failed to read register: %d", reg);
return 0; return 0;
} }
@ -206,7 +204,7 @@ size_t ctx_get_size(const cs_insn *instr, cs_arm64_op *operand) {
} }
mnemonic_len = strlen(instr->mnemonic); mnemonic_len = strlen(instr->mnemonic);
if (mnemonic_len == 0) { FATAL("No mnemonic found"); }; if (mnemonic_len == 0) { FFATAL("No mnemonic found"); };
char last = instr->mnemonic[mnemonic_len - 1]; char last = instr->mnemonic[mnemonic_len - 1];
switch (last) { switch (last) {
@ -252,14 +250,14 @@ size_t ctx_get_size(const cs_insn *instr, cs_arm64_op *operand) {
if (mnemonic_len < 3) { if (mnemonic_len < 3) {
FATAL("VAS Mnemonic too short: %s\n", instr->mnemonic); FFATAL("VAS Mnemonic too short: %s\n", instr->mnemonic);
} }
vas_digit = instr->mnemonic[2]; vas_digit = instr->mnemonic[2];
if (vas_digit < '0' || vas_digit > '9') { if (vas_digit < '0' || vas_digit > '9') {
FATAL("VAS Mnemonic digit out of range: %s\n", instr->mnemonic); FFATAL("VAS Mnemonic digit out of range: %s\n", instr->mnemonic);
} }
@ -293,7 +291,7 @@ size_t ctx_get_size(const cs_insn *instr, cs_arm64_op *operand) {
case ARM64_VAS_16B: case ARM64_VAS_16B:
return 16 * count_byte; return 16 * count_byte;
default: default:
FATAL("Unexpected VAS type: %s %d", instr->mnemonic, operand->vas); FFATAL("Unexpected VAS type: %s %d", instr->mnemonic, operand->vas);
} }

5
frida_mode/src/ctx/ctx_x64.c
View File

@ -1,8 +1,7 @@
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "debug.h"
#include "ctx.h" #include "ctx.h"
#include "util.h"
#if defined(__x86_64__) #if defined(__x86_64__)
@ -121,7 +120,7 @@ gsize ctx_read_reg(GumX64CpuContext *ctx, x86_reg reg) {
X86_REG_64(X86_REG_RIP, ctx->rip) X86_REG_64(X86_REG_RIP, ctx->rip)
default: default:
FATAL("Failed to read register: %d", reg); FFATAL("Failed to read register: %d", reg);
return 0; return 0;
} }

4
frida_mode/src/ctx/ctx_x86.c
View File

@ -1,7 +1,5 @@
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "debug.h"
#include "ctx.h" #include "ctx.h"
#if defined(__i386__) #if defined(__i386__)
@ -72,7 +70,7 @@ gsize ctx_read_reg(GumIA32CpuContext *ctx, x86_reg reg) {
X86_REG_32(X86_REG_EIP, ctx->eip) X86_REG_32(X86_REG_EIP, ctx->eip)
default: default:
FATAL("Failed to read register: %d", reg); FFATAL("Failed to read register: %d", reg);
return 0; return 0;
} }

16
frida_mode/src/entry.c
View File

@ -6,8 +6,6 @@
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "debug.h"
#include "entry.h" #include "entry.h"
#include "instrument.h" #include "instrument.h"
#include "persistent.h" #include "persistent.h"
@ -26,7 +24,7 @@ gboolean entry_run = FALSE;
static void entry_launch(void) { static void entry_launch(void) {
OKF("Entry point reached"); FOKF("Entry point reached");
__afl_manual_init(); __afl_manual_init();
/* Child here */ /* Child here */
@ -45,7 +43,7 @@ void entry_on_fork(void) {
if (prctl(PR_SET_PTRACER, PR_SET_PTRACER_ANY) < 0) { if (prctl(PR_SET_PTRACER, PR_SET_PTRACER_ANY) < 0) {
FATAL("Failed to PR_SET_PTRACER"); FFATAL("Failed to PR_SET_PTRACER");
} }
@ -56,7 +54,7 @@ void entry_on_fork(void) {
#else #else
void entry_on_fork(void) { void entry_on_fork(void) {
if (traceable) { WARNF("AFL_FRIDA_TRACEABLE unsupported"); } if (traceable) { FWARNF("AFL_FRIDA_TRACEABLE unsupported"); }
} }
@ -71,10 +69,10 @@ void entry_config(void) {
void entry_init(void) { void entry_init(void) {
OKF("entry_point: 0x%016" G_GINT64_MODIFIER "X", entry_point); FOKF("entry_point: 0x%016" G_GINT64_MODIFIER "X", entry_point);
OKF("dumpable: [%c]", traceable ? 'X' : ' '); FOKF("dumpable: [%c]", traceable ? 'X' : ' ');
if (dlopen(NULL, RTLD_NOW) == NULL) { FATAL("Failed to dlopen: %d", errno); } if (dlopen(NULL, RTLD_NOW) == NULL) { FFATAL("Failed to dlopen: %d", errno); }
} }
@ -96,7 +94,7 @@ static void entry_callout(GumCpuContext *cpu_context, gpointer user_data) {
void entry_prologue(GumStalkerIterator *iterator, GumStalkerOutput *output) { void entry_prologue(GumStalkerIterator *iterator, GumStalkerOutput *output) {
UNUSED_PARAMETER(output); UNUSED_PARAMETER(output);
OKF("AFL_ENTRYPOINT reached"); FOKF("AFL_ENTRYPOINT reached");
if (persistent_start == 0) { if (persistent_start == 0) {

13
frida_mode/src/instrument/instrument.c
View File

@ -6,7 +6,6 @@
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "config.h" #include "config.h"
#include "debug.h"
#include "hash.h" #include "hash.h"
#include "asan.h" #include "asan.h"
@ -261,12 +260,12 @@ void instrument_init(void) {
if (!instrument_is_coverage_optimize_supported()) instrument_optimize = false; if (!instrument_is_coverage_optimize_supported()) instrument_optimize = false;
OKF("Instrumentation - optimize [%c]", instrument_optimize ? 'X' : ' '); FOKF("Instrumentation - optimize [%c]", instrument_optimize ? 'X' : ' ');
OKF("Instrumentation - tracing [%c]", instrument_tracing ? 'X' : ' '); FOKF("Instrumentation - tracing [%c]", instrument_tracing ? 'X' : ' ');
OKF("Instrumentation - unique [%c]", instrument_unique ? 'X' : ' '); FOKF("Instrumentation - unique [%c]", instrument_unique ? 'X' : ' ');
OKF("Instrumentation - fixed seed [%c] [0x%016" G_GINT64_MODIFIER "x]", FOKF("Instrumentation - fixed seed [%c] [0x%016" G_GINT64_MODIFIER "x]",
instrument_use_fixed_seed ? 'X' : ' ', instrument_fixed_seed); instrument_use_fixed_seed ? 'X' : ' ', instrument_fixed_seed);
OKF("Instrumentation - unstable coverage [%c] [%s]", FOKF("Instrumentation - unstable coverage [%c] [%s]",
instrument_coverage_unstable_filename == NULL ? ' ' : 'X', instrument_coverage_unstable_filename == NULL ? ' ' : 'X',
instrument_coverage_unstable_filename); instrument_coverage_unstable_filename);
@ -352,7 +351,7 @@ void instrument_init(void) {
} }
OKF("Instrumentation - seed [0x%016" G_GINT64_MODIFIER "x]", FOKF("Instrumentation - seed [0x%016" G_GINT64_MODIFIER "x]",
instrument_hash_seed); instrument_hash_seed);
instrument_hash_zero = instrument_get_offset_hash(0); instrument_hash_zero = instrument_get_offset_hash(0);

6
frida_mode/src/instrument/instrument_arm32.c
View File

@ -1,7 +1,5 @@
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "debug.h"
#include "instrument.h" #include "instrument.h"
#include "util.h" #include "util.h"
@ -18,13 +16,13 @@ void instrument_coverage_optimize(const cs_insn * instr,
UNUSED_PARAMETER(instr); UNUSED_PARAMETER(instr);
UNUSED_PARAMETER(output); UNUSED_PARAMETER(output);
FATAL("Optimized coverage not supported on this architecture"); FFATAL("Optimized coverage not supported on this architecture");
} }
void instrument_coverage_optimize_init(void) { void instrument_coverage_optimize_init(void) {
WARNF("Optimized coverage not supported on this architecture"); FWARNF("Optimized coverage not supported on this architecture");
} }

1
frida_mode/src/instrument/instrument_arm64.c
View File

@ -1,7 +1,6 @@
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "config.h" #include "config.h"
#include "debug.h"
#include "instrument.h" #include "instrument.h"

64
frida_mode/src/instrument/instrument_coverage.c
View File

@ -5,8 +5,6 @@
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "debug.h"
#include "instrument.h" #include "instrument.h"
#include "util.h" #include "util.h"
@ -251,7 +249,7 @@ static void coverage_write(void *data, size_t size) {
if (written < 0) { if (written < 0) {
FATAL("Coverage - Failed to write: %s (%d)\n", (char *)data, errno); FFATAL("Coverage - Failed to write: %s (%d)\n", (char *)data, errno);
} }
@ -371,7 +369,7 @@ static void instrument_coverage_normal_run() {
if (close(normal_coverage_pipes[STDOUT_FILENO]) != 0) { if (close(normal_coverage_pipes[STDOUT_FILENO]) != 0) {
FATAL("Failed to close parent read pipe"); FFATAL("Failed to close parent read pipe");
} }
@ -379,7 +377,7 @@ static void instrument_coverage_normal_run() {
g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, g_free); g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, g_free);
if (coverage_hash == NULL) { if (coverage_hash == NULL) {
FATAL("Failed to g_hash_table_new, errno: %d", errno); FFATAL("Failed to g_hash_table_new, errno: %d", errno);
} }
@ -396,7 +394,7 @@ static void instrument_coverage_normal_run() {
} }
if (bytes != 0) { FATAL("Coverage data truncated"); } if (bytes != 0) { FFATAL("Coverage data truncated"); }
instrument_coverage_print("Coverage - Preparing\n"); instrument_coverage_print("Coverage - Preparing\n");
@ -435,7 +433,7 @@ static GArray *instrument_coverage_unstable_read_unstable_ids(void) {
if (!g_file_get_contents(unstable_coverage_fuzzer_stats, &contents, &length, if (!g_file_get_contents(unstable_coverage_fuzzer_stats, &contents, &length,
NULL)) { NULL)) {
FATAL("Failed to read fuzzer_stats"); FFATAL("Failed to read fuzzer_stats");
} }
@ -526,7 +524,7 @@ static GHashTable *instrument_collect_unstable_blocks(
GHashTable *child = GHashTable *child =
(GHashTable *)g_hash_table_lookup(unstable_coverage_hash, *id); (GHashTable *)g_hash_table_lookup(unstable_coverage_hash, *id);
if (child == NULL) { FATAL("Failed to find edge ID"); } if (child == NULL) { FFATAL("Failed to find edge ID"); }
GHashTableIter iter = {0}; GHashTableIter iter = {0};
gpointer value; gpointer value;
@ -565,7 +563,7 @@ static void instrument_coverage_unstable_run(void) {
if (close(unstable_coverage_pipes[STDOUT_FILENO]) != 0) { if (close(unstable_coverage_pipes[STDOUT_FILENO]) != 0) {
FATAL("Failed to close parent read pipe"); FFATAL("Failed to close parent read pipe");
} }
@ -573,7 +571,7 @@ static void instrument_coverage_unstable_run(void) {
g_direct_hash, g_direct_equal, NULL, (GDestroyNotify)g_hash_table_unref); g_direct_hash, g_direct_equal, NULL, (GDestroyNotify)g_hash_table_unref);
if (unstable_coverage_hash == NULL) { if (unstable_coverage_hash == NULL) {
FATAL("Failed to g_hash_table_new, errno: %d", errno); FFATAL("Failed to g_hash_table_new, errno: %d", errno);
} }
@ -599,7 +597,7 @@ static void instrument_coverage_unstable_run(void) {
if (!g_hash_table_insert(unstable_coverage_hash, if (!g_hash_table_insert(unstable_coverage_hash,
GSIZE_TO_POINTER(value->edge), hash_value)) { GSIZE_TO_POINTER(value->edge), hash_value)) {
FATAL("Entry already in hashtable"); FFATAL("Entry already in hashtable");
} }
@ -613,7 +611,7 @@ static void instrument_coverage_unstable_run(void) {
} }
if (bytes != 0) { FATAL("Unstable coverage data truncated"); } if (bytes != 0) { FFATAL("Unstable coverage data truncated"); }
instrument_coverage_print("Coverage - Preparing\n"); instrument_coverage_print("Coverage - Preparing\n");
@ -659,33 +657,33 @@ void instrument_coverage_config(void) {
void instrument_coverage_normal_init(void) { void instrument_coverage_normal_init(void) {
OKF("Coverage - enabled [%c]", FOKF("Coverage - enabled [%c]",
instrument_coverage_filename == NULL ? ' ' : 'X'); instrument_coverage_filename == NULL ? ' ' : 'X');
if (instrument_coverage_filename == NULL) { return; } if (instrument_coverage_filename == NULL) { return; }
OKF("Coverage - file [%s]", instrument_coverage_filename); FOKF("Coverage - file [%s]", instrument_coverage_filename);
char *path = g_canonicalize_filename(instrument_coverage_filename, char *path = g_canonicalize_filename(instrument_coverage_filename,
g_get_current_dir()); g_get_current_dir());
OKF("Coverage - path [%s]", path); FOKF("Coverage - path [%s]", path);
normal_coverage_fd = open(path, O_RDWR | O_CREAT | O_TRUNC, normal_coverage_fd = open(path, O_RDWR | O_CREAT | O_TRUNC,
S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
if (normal_coverage_fd < 0) { if (normal_coverage_fd < 0) {
FATAL("Failed to open coverage file '%s'", path); FFATAL("Failed to open coverage file '%s'", path);
} }
g_free(path); g_free(path);
if (pipe(normal_coverage_pipes) != 0) { FATAL("Failed to create pipes"); } if (pipe(normal_coverage_pipes) != 0) { FFATAL("Failed to create pipes"); }
pid_t pid = fork(); pid_t pid = fork();
if (pid == -1) { FATAL("Failed to start coverage process"); } if (pid == -1) { FFATAL("Failed to start coverage process"); }
if (pid == 0) { if (pid == 0) {
@ -697,13 +695,13 @@ void instrument_coverage_normal_init(void) {
if (close(normal_coverage_fd) < 0) { if (close(normal_coverage_fd) < 0) {
FATAL("Failed to close coverage output file"); FFATAL("Failed to close coverage output file");
} }
if (close(normal_coverage_pipes[STDIN_FILENO]) != 0) { if (close(normal_coverage_pipes[STDIN_FILENO]) != 0) {
FATAL("Failed to close parent read pipe"); FFATAL("Failed to close parent read pipe");
} }
@ -714,11 +712,11 @@ void instrument_coverage_unstable_find_output(void) {
gchar *fds_name = g_strdup_printf("/proc/%d/fd/", getppid()); gchar *fds_name = g_strdup_printf("/proc/%d/fd/", getppid());
gchar *root = g_file_read_link("/proc/self/root", NULL); gchar *root = g_file_read_link("/proc/self/root", NULL);
if (root == NULL) { FATAL("Failed to read link"); } if (root == NULL) { FFATAL("Failed to read link"); }
GDir *dir = g_dir_open(fds_name, 0, NULL); GDir *dir = g_dir_open(fds_name, 0, NULL);
OKF("Coverage Unstable - fds: %s", fds_name); FOKF("Coverage Unstable - fds: %s", fds_name);
for (const gchar *filename = g_dir_read_name(dir); filename != NULL; for (const gchar *filename = g_dir_read_name(dir); filename != NULL;
filename = g_dir_read_name(dir)) { filename = g_dir_read_name(dir)) {
@ -726,7 +724,7 @@ void instrument_coverage_unstable_find_output(void) {
gchar *fullname = g_build_path("/", fds_name, filename, NULL); gchar *fullname = g_build_path("/", fds_name, filename, NULL);
gchar *link = g_file_read_link(fullname, NULL); gchar *link = g_file_read_link(fullname, NULL);
if (link == NULL) { FATAL("Failed to read link: %s", fullname); } if (link == NULL) { FFATAL("Failed to read link: %s", fullname); }
gchar *basename = g_path_get_basename(link); gchar *basename = g_path_get_basename(link);
if (g_strcmp0(basename, "default") != 0) { if (g_strcmp0(basename, "default") != 0) {
@ -778,11 +776,11 @@ void instrument_coverage_unstable_find_output(void) {
if (unstable_coverage_fuzzer_stats == NULL) { if (unstable_coverage_fuzzer_stats == NULL) {
FATAL("Failed to find fuzzer stats"); FFATAL("Failed to find fuzzer stats");
} }
OKF("Fuzzer stats: %s", unstable_coverage_fuzzer_stats); FOKF("Fuzzer stats: %s", unstable_coverage_fuzzer_stats);
} }
@ -793,14 +791,14 @@ void instrument_coverage_unstable_init(void) {
char *path = g_canonicalize_filename(instrument_coverage_unstable_filename, char *path = g_canonicalize_filename(instrument_coverage_unstable_filename,
g_get_current_dir()); g_get_current_dir());
OKF("Coverage - unstable path [%s]", instrument_coverage_unstable_filename); FOKF("Coverage - unstable path [%s]", instrument_coverage_unstable_filename);
unstable_coverage_fd = open(path, O_RDWR | O_CREAT | O_TRUNC, unstable_coverage_fd = open(path, O_RDWR | O_CREAT | O_TRUNC,
S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
if (unstable_coverage_fd < 0) { if (unstable_coverage_fd < 0) {
FATAL("Failed to open unstable coverage file '%s'", path); FFATAL("Failed to open unstable coverage file '%s'", path);
} }
@ -810,12 +808,12 @@ void instrument_coverage_unstable_init(void) {
if (pipe(unstable_coverage_pipes) != 0) { if (pipe(unstable_coverage_pipes) != 0) {
FATAL("Failed to create unstable pipes"); FFATAL("Failed to create unstable pipes");
} }
pid_t pid = fork(); pid_t pid = fork();
if (pid == -1) { FATAL("Failed to start coverage process"); } if (pid == -1) { FFATAL("Failed to start coverage process"); }
if (pid == 0) { if (pid == 0) {
@ -827,13 +825,13 @@ void instrument_coverage_unstable_init(void) {
if (close(unstable_coverage_fd) < 0) { if (close(unstable_coverage_fd) < 0) {
FATAL("Failed to close unstable coverage output file"); FFATAL("Failed to close unstable coverage output file");
} }
if (close(unstable_coverage_pipes[STDIN_FILENO]) != 0) { if (close(unstable_coverage_pipes[STDIN_FILENO]) != 0) {
FATAL("Failed to close parent read pipe"); FFATAL("Failed to close parent read pipe");
} }
@ -865,7 +863,7 @@ void instrument_coverage_end(uint64_t address) {
if (write(normal_coverage_pipes[STDOUT_FILENO], &data, if (write(normal_coverage_pipes[STDOUT_FILENO], &data,
sizeof(normal_coverage_data_t)) != sizeof(normal_coverage_data_t)) { sizeof(normal_coverage_data_t)) != sizeof(normal_coverage_data_t)) {
FATAL("Coverage I/O error"); FFATAL("Coverage I/O error");
} }
@ -888,7 +886,7 @@ void instrument_coverage_unstable(guint64 edge, guint64 previous_rip,
sizeof(unstable_coverage_data_t)) != sizeof(unstable_coverage_data_t)) !=
sizeof(unstable_coverage_data_t)) { sizeof(unstable_coverage_data_t)) {
FATAL("Unstable coverage I/O error"); FFATAL("Unstable coverage I/O error");
} }

10
frida_mode/src/instrument/instrument_debug.c
View File

@ -5,8 +5,6 @@
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "debug.h"
#include "instrument.h" #include "instrument.h"
#include "util.h" #include "util.h"
@ -89,24 +87,24 @@ void instrument_debug_config(void) {
void instrument_debug_init(void) { void instrument_debug_init(void) {
OKF("Instrumentation debugging - enabled [%c]", FOKF("Instrumentation debugging - enabled [%c]",
instrument_debug_filename == NULL ? ' ' : 'X'); instrument_debug_filename == NULL ? ' ' : 'X');
if (instrument_debug_filename == NULL) { return; } if (instrument_debug_filename == NULL) { return; }
OKF("Instrumentation debugging - file [%s]", instrument_debug_filename); FOKF("Instrumentation debugging - file [%s]", instrument_debug_filename);
if (instrument_debug_filename == NULL) { return; } if (instrument_debug_filename == NULL) { return; }
char *path = char *path =
g_canonicalize_filename(instrument_debug_filename, g_get_current_dir()); g_canonicalize_filename(instrument_debug_filename, g_get_current_dir());
OKF("Instrumentation debugging - path [%s]", path); FOKF("Instrumentation debugging - path [%s]", path);
debugging_fd = open(path, O_RDWR | O_CREAT | O_TRUNC, debugging_fd = open(path, O_RDWR | O_CREAT | O_TRUNC,
S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
if (debugging_fd < 0) { FATAL("Failed to open stats file '%s'", path); } if (debugging_fd < 0) { FFATAL("Failed to open stats file '%s'", path); }
g_free(path); g_free(path);

17
frida_mode/src/instrument/instrument_x64.c
View File

@ -15,11 +15,11 @@
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "config.h" #include "config.h"
#include "debug.h"
#include "instrument.h" #include "instrument.h"
#include "ranges.h" #include "ranges.h"
#include "stalker.h" #include "stalker.h"
#include "util.h"
#if defined(__x86_64__) #if defined(__x86_64__)
@ -238,6 +238,9 @@ static void instrument_coverage_switch(GumStalkerObserver *self,
const cs_insn * from_insn, const cs_insn * from_insn,
gpointer * target) { gpointer * target) {
UNUSED_PARAMETER(self);
UNUSED_PARAMETER(start_address);
cs_x86 * x86; cs_x86 * x86;
cs_x86_op *op; cs_x86_op *op;
if (from_insn == NULL) { return; } if (from_insn == NULL) { return; }
@ -271,7 +274,7 @@ static void instrument_coverage_switch(GumStalkerObserver *self,
} }
*target = *target + sizeof(afl_log_code); *target = (guint8 *)*target + sizeof(afl_log_code);
} }
@ -282,7 +285,7 @@ void instrument_coverage_optimize_init(void) {
gum_process_enumerate_ranges(GUM_PAGE_NO_ACCESS, instrument_coverage_find_low, gum_process_enumerate_ranges(GUM_PAGE_NO_ACCESS, instrument_coverage_find_low,
&low_address); &low_address);
OKF("Low address: %p", low_address); FOKF("Low address: %p", low_address);
if (low_address == 0 || if (low_address == 0 ||
GPOINTER_TO_SIZE(low_address) > ((2UL << 20) - __afl_map_size)) { GPOINTER_TO_SIZE(low_address) > ((2UL << 20) - __afl_map_size)) {
@ -294,11 +297,11 @@ void instrument_coverage_optimize_init(void) {
ranges_print_debug_maps(); ranges_print_debug_maps();
char *shm_env = getenv(SHM_ENV_VAR); char *shm_env = getenv(SHM_ENV_VAR);
OKF("SHM_ENV_VAR: %s", shm_env); FOKF("SHM_ENV_VAR: %s", shm_env);
if (shm_env == NULL) { if (shm_env == NULL) {
WARNF("SHM_ENV_VAR not set, using anonymous map for debugging purposes"); FWARNF("SHM_ENV_VAR not set, using anonymous map for debugging purposes");
instrument_coverage_optimize_map_mmap_anon(low_address); instrument_coverage_optimize_map_mmap_anon(low_address);
@ -318,8 +321,8 @@ void instrument_coverage_optimize_init(void) {
} }
OKF("__afl_area_ptr: %p", __afl_area_ptr); FOKF("__afl_area_ptr: %p", __afl_area_ptr);
OKF("instrument_previous_pc: %p", &instrument_previous_pc); FOKF("instrument_previous_pc: %p", &instrument_previous_pc);
} }

2
frida_mode/src/instrument/instrument_x86.c
View File

@ -1,7 +1,5 @@
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "debug.h"
#include "instrument.h" #include "instrument.h"
#include "util.h" #include "util.h"

5
frida_mode/src/intercept.c
View File

@ -1,8 +1,7 @@
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "debug.h"
#include "intercept.h" #include "intercept.h"
#include "util.h"
void intercept_hook(void *address, gpointer replacement, gpointer user_data) { void intercept_hook(void *address, gpointer replacement, gpointer user_data) {
@ -10,7 +9,7 @@ void intercept_hook(void *address, gpointer replacement, gpointer user_data) {
gum_interceptor_begin_transaction(interceptor); gum_interceptor_begin_transaction(interceptor);
GumReplaceReturn ret = GumReplaceReturn ret =
gum_interceptor_replace(interceptor, address, replacement, user_data); gum_interceptor_replace(interceptor, address, replacement, user_data);
if (ret != GUM_REPLACE_OK) { FATAL("gum_interceptor_attach: %d", ret); } if (ret != GUM_REPLACE_OK) { FFATAL("gum_interceptor_attach: %d", ret); }
gum_interceptor_end_transaction(interceptor); gum_interceptor_end_transaction(interceptor);
} }

16
frida_mode/src/js/js.c
View File

@ -1,7 +1,5 @@
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "debug.h"
#include "js.h" #include "js.h"
#include "util.h" #include "util.h"
@ -25,7 +23,7 @@ static void js_msg(GumScript *script, const gchar *message, GBytes *data,
UNUSED_PARAMETER(script); UNUSED_PARAMETER(script);
UNUSED_PARAMETER(data); UNUSED_PARAMETER(data);
UNUSED_PARAMETER(user_data); UNUSED_PARAMETER(user_data);
OKF("%s", message); FOKF("%s", message);
} }
@ -50,13 +48,13 @@ static gchar *js_get_script() {
} else { } else {
FATAL("Could not load script file: %s", filename); FFATAL("Could not load script file: %s", filename);
} }
} else { } else {
OKF("Loaded AFL script: %s, %" G_GSIZE_MODIFIER "d bytes", filename, FOKF("Loaded AFL script: %s, %" G_GSIZE_MODIFIER "d bytes", filename,
length); length);
gchar *source = g_malloc0(api_js_len + length + 1); gchar *source = g_malloc0(api_js_len + length + 1);
@ -75,7 +73,7 @@ static void js_print_script(gchar *source) {
for (size_t i = 0; split[i] != NULL; i++) { for (size_t i = 0; split[i] != NULL; i++) {
OKF("%3" G_GSIZE_MODIFIER "d. %s", i + 1, split[i]); FOKF("%3" G_GSIZE_MODIFIER "d. %s", i + 1, split[i]);
} }
@ -89,7 +87,7 @@ static void load_cb(GObject *source_object, GAsyncResult *result,
UNUSED_PARAMETER(source_object); UNUSED_PARAMETER(source_object);
UNUSED_PARAMETER(user_data); UNUSED_PARAMETER(user_data);
gum_script_load_finish(script, result); gum_script_load_finish(script, result);
if (error != NULL) { FATAL("Failed to load script - %s", error->message); } if (error != NULL) { FFATAL("Failed to load script - %s", error->message); }
} }
@ -99,7 +97,7 @@ static void create_cb(GObject *source_object, GAsyncResult *result,
UNUSED_PARAMETER(source_object); UNUSED_PARAMETER(source_object);
UNUSED_PARAMETER(user_data); UNUSED_PARAMETER(user_data);
script = gum_script_backend_create_finish(backend, result, &error); script = gum_script_backend_create_finish(backend, result, &error);
if (error != NULL) { FATAL("Failed to create script: %s", error->message); } if (error != NULL) { FFATAL("Failed to create script: %s", error->message); }
gum_script_set_message_handler(script, js_msg, NULL, NULL); gum_script_set_message_handler(script, js_msg, NULL, NULL);
@ -128,7 +126,7 @@ void js_start(void) {
while (g_main_context_pending(context)) while (g_main_context_pending(context))
g_main_context_iteration(context, FALSE); g_main_context_iteration(context, FALSE);
if (!js_done) { FATAL("Script didn't call Afl.done()"); } if (!js_done) { FFATAL("Script didn't call Afl.done()"); }
} }

3
frida_mode/src/js/js_api.c
View File

@ -1,4 +1,3 @@
#include "debug.h"
#include "entry.h" #include "entry.h"
#include "instrument.h" #include "instrument.h"
@ -20,7 +19,7 @@ __attribute__((visibility("default"))) void js_api_done() {
__attribute__((visibility("default"))) void js_api_error(char *msg) { __attribute__((visibility("default"))) void js_api_error(char *msg) {
FATAL("%s", msg); FFATAL("%s", msg);
} }

49
frida_mode/src/lib/lib.c
View File

@ -8,9 +8,8 @@
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "debug.h"
#include "lib.h" #include "lib.h"
#include "util.h"
#if defined(__arm__) || defined(__i386__) #if defined(__arm__) || defined(__i386__)
#define ELFCLASS ELFCLASS32 #define ELFCLASS ELFCLASS32
@ -55,11 +54,11 @@ static gboolean lib_find_exe(const GumModuleDetails *details,
static void lib_validate_hdr(Elf_Ehdr *hdr) { static void lib_validate_hdr(Elf_Ehdr *hdr) {
if (hdr->e_ident[0] != ELFMAG0) FATAL("Invalid e_ident[0]"); if (hdr->e_ident[0] != ELFMAG0) FFATAL("Invalid e_ident[0]");
if (hdr->e_ident[1] != ELFMAG1) FATAL("Invalid e_ident[1]"); if (hdr->e_ident[1] != ELFMAG1) FFATAL("Invalid e_ident[1]");
if (hdr->e_ident[2] != ELFMAG2) FATAL("Invalid e_ident[2]"); if (hdr->e_ident[2] != ELFMAG2) FFATAL("Invalid e_ident[2]");
if (hdr->e_ident[3] != ELFMAG3) FATAL("Invalid e_ident[3]"); if (hdr->e_ident[3] != ELFMAG3) FFATAL("Invalid e_ident[3]");
if (hdr->e_ident[4] != ELFCLASS) FATAL("Invalid class"); if (hdr->e_ident[4] != ELFCLASS) FFATAL("Invalid class");
} }
@ -88,18 +87,22 @@ static void lib_read_text_section(lib_details_t *lib_details, Elf_Ehdr *hdr) {
} }
if (!found_preferred_base) { FATAL("Failed to find preferred load address"); } if (!found_preferred_base) {
OKF("Image preferred load address 0x%016" G_GSIZE_MODIFIER "x", FFATAL("Failed to find preferred load address");
}
FOKF("Image preferred load address 0x%016" G_GSIZE_MODIFIER "x",
preferred_base); preferred_base);
shdr = (Elf_Shdr *)((char *)hdr + hdr->e_shoff); shdr = (Elf_Shdr *)((char *)hdr + hdr->e_shoff);
shstrtab = &shdr[hdr->e_shstrndx]; shstrtab = &shdr[hdr->e_shstrndx];
shstr = (char *)hdr + shstrtab->sh_offset; shstr = (char *)hdr + shstrtab->sh_offset;
OKF("shdr: %p", shdr); FOKF("shdr: %p", shdr);
OKF("shstrtab: %p", shstrtab); FOKF("shstrtab: %p", shstrtab);
OKF("shstr: %p", shstr); FOKF("shstr: %p", shstr);
for (size_t i = 0; i < hdr->e_shnum; i++) { for (size_t i = 0; i < hdr->e_shnum; i++) {
@ -108,7 +111,7 @@ static void lib_read_text_section(lib_details_t *lib_details, Elf_Ehdr *hdr) {
if (curr->sh_name == 0) continue; if (curr->sh_name == 0) continue;
section_name = &shstr[curr->sh_name]; section_name = &shstr[curr->sh_name];
OKF("Section: %2" G_GSIZE_MODIFIER "u - base: 0x%016" G_GSIZE_MODIFIER FOKF("Section: %2" G_GSIZE_MODIFIER "u - base: 0x%016" G_GSIZE_MODIFIER
"X size: 0x%016" G_GSIZE_MODIFIER "X %s", "X size: 0x%016" G_GSIZE_MODIFIER "X %s",
i, curr->sh_addr, curr->sh_size, section_name); i, curr->sh_addr, curr->sh_size, section_name);
if (memcmp(section_name, text_name, sizeof(text_name)) == 0 && if (memcmp(section_name, text_name, sizeof(text_name)) == 0 &&
@ -116,8 +119,8 @@ static void lib_read_text_section(lib_details_t *lib_details, Elf_Ehdr *hdr) {
text_base = lib_details->base_address + curr->sh_addr - preferred_base; text_base = lib_details->base_address + curr->sh_addr - preferred_base;
text_limit = text_base + curr->sh_size; text_limit = text_base + curr->sh_size;
OKF("> text_addr: 0x%016" G_GINT64_MODIFIER "X", text_base); FOKF("> text_addr: 0x%016" G_GINT64_MODIFIER "X", text_base);
OKF("> text_limit: 0x%016" G_GINT64_MODIFIER "X", text_limit); FOKF("> text_limit: 0x%016" G_GINT64_MODIFIER "X", text_limit);
} }
@ -132,16 +135,16 @@ static void lib_get_text_section(lib_details_t *details) {
Elf_Ehdr *hdr; Elf_Ehdr *hdr;
fd = open(details->path, O_RDONLY); fd = open(details->path, O_RDONLY);
if (fd < 0) { FATAL("Failed to open %s", details->path); } if (fd < 0) { FFATAL("Failed to open %s", details->path); }
len = lseek(fd, 0, SEEK_END); len = lseek(fd, 0, SEEK_END);
if (len == (off_t)-1) { FATAL("Failed to lseek %s", details->path); } if (len == (off_t)-1) { FFATAL("Failed to lseek %s", details->path); }
OKF("len: %ld", len); FOKF("len: %ld", len);
hdr = (Elf_Ehdr *)mmap(NULL, len, PROT_READ, MAP_PRIVATE, fd, 0); hdr = (Elf_Ehdr *)mmap(NULL, len, PROT_READ, MAP_PRIVATE, fd, 0);
if (hdr == MAP_FAILED) { FATAL("Failed to map %s", details->path); } if (hdr == MAP_FAILED) { FFATAL("Failed to map %s", details->path); }
lib_validate_hdr(hdr); lib_validate_hdr(hdr);
lib_read_text_section(details, hdr); lib_read_text_section(details, hdr);
@ -159,22 +162,22 @@ void lib_init(void) {
lib_details_t lib_details; lib_details_t lib_details;
gum_process_enumerate_modules(lib_find_exe, &lib_details); gum_process_enumerate_modules(lib_find_exe, &lib_details);
OKF("Executable: 0x%016" G_GINT64_MODIFIER "x - %s", lib_details.base_address, FOKF("Executable: 0x%016" G_GINT64_MODIFIER "x - %s",
lib_details.path); lib_details.base_address, lib_details.path);
lib_get_text_section(&lib_details); lib_get_text_section(&lib_details);
} }
guint64 lib_get_text_base(void) { guint64 lib_get_text_base(void) {
if (text_base == 0) FATAL("Lib not initialized"); if (text_base == 0) FFATAL("Lib not initialized");
return text_base; return text_base;
} }
guint64 lib_get_text_limit(void) { guint64 lib_get_text_limit(void) {
if (text_limit == 0) FATAL("Lib not initialized"); if (text_limit == 0) FFATAL("Lib not initialized");
return text_limit; return text_limit;
} }

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

@ -1,8 +1,6 @@
#ifdef __APPLE__ #ifdef __APPLE__
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "debug.h"
#include "lib.h" #include "lib.h"
#include "util.h" #include "util.h"
@ -22,7 +20,7 @@ static gboolean lib_get_main_module(const GumModuleDetails *details,
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);
OKF("Found main module: %s", module->name); FOKF("Found main module: %s", module->name);
*ret = module; *ret = module;
@ -37,7 +35,7 @@ gboolean lib_get_text_section(const GumDarwinSectionDetails *details,
static size_t idx = 0; static size_t idx = 0;
char text_name[] = "__text"; char text_name[] = "__text";
OKF("Section: %2lu - base: 0x%016" G_GINT64_MODIFIER FOKF("Section: %2lu - base: 0x%016" G_GINT64_MODIFIER
"X size: 0x%016" G_GINT64_MODIFIER "X %s", "X size: 0x%016" G_GINT64_MODIFIER "X %s",
idx++, details->vm_address, details->vm_address + details->size, idx++, details->vm_address, details->vm_address + details->size,
details->section_name); details->section_name);
@ -47,8 +45,8 @@ gboolean lib_get_text_section(const GumDarwinSectionDetails *details,
text_base = details->vm_address; text_base = details->vm_address;
text_limit = details->vm_address + details->size; text_limit = details->vm_address + details->size;
OKF("> text_addr: 0x%016" G_GINT64_MODIFIER "X", text_base); FOKF("> text_addr: 0x%016" G_GINT64_MODIFIER "X", text_base);
OKF("> text_limit: 0x%016" G_GINT64_MODIFIER "X", text_limit); FOKF("> text_limit: 0x%016" G_GINT64_MODIFIER "X", text_limit);
} }
@ -70,14 +68,14 @@ void lib_init(void) {
guint64 lib_get_text_base(void) { guint64 lib_get_text_base(void) {
if (text_base == 0) FATAL("Lib not initialized"); if (text_base == 0) FFATAL("Lib not initialized");
return text_base; return text_base;
} }
guint64 lib_get_text_limit(void) { guint64 lib_get_text_limit(void) {
if (text_limit == 0) FATAL("Lib not initialized"); if (text_limit == 0) FFATAL("Lib not initialized");
return text_limit; return text_limit;
} }

21
frida_mode/src/main.c
View File

@ -15,7 +15,6 @@
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "config.h" #include "config.h"
#include "debug.h"
#include "entry.h" #include "entry.h"
#include "instrument.h" #include "instrument.h"
@ -63,7 +62,7 @@ static void on_main_os(int argc, char **argv, char **envp) {
/* Personality doesn't affect the current process, it only takes effect on /* Personality doesn't affect the current process, it only takes effect on
* evec */ * evec */
int persona = personality(ADDR_NO_RANDOMIZE); int persona = personality(ADDR_NO_RANDOMIZE);
if (persona == -1) { WARNF("Failed to set ADDR_NO_RANDOMIZE: %d", errno); } if (persona == -1) { FWARNF("Failed to set ADDR_NO_RANDOMIZE: %d", errno); }
if ((persona & ADDR_NO_RANDOMIZE) == 0) { execvpe(argv[0], argv, envp); } if ((persona & ADDR_NO_RANDOMIZE) == 0) { execvpe(argv[0], argv, envp); }
GumInterceptor *interceptor = gum_interceptor_obtain(); GumInterceptor *interceptor = gum_interceptor_obtain();
@ -98,7 +97,7 @@ static void afl_print_cmdline(void) {
if (fd < 0) { if (fd < 0) {
WARNF("Failed to open /proc/self/cmdline, errno: (%d)", errno); FWARNF("Failed to open /proc/self/cmdline, errno: (%d)", errno);
return; return;
} }
@ -106,7 +105,7 @@ static void afl_print_cmdline(void) {
ssize_t bytes_read = read(fd, buffer, PROC_MAX - 1); ssize_t bytes_read = read(fd, buffer, PROC_MAX - 1);
if (bytes_read < 0) { if (bytes_read < 0) {
FATAL("Failed to read /proc/self/cmdline, errno: (%d)", errno); FFATAL("Failed to read /proc/self/cmdline, errno: (%d)", errno);
} }
@ -116,7 +115,7 @@ static void afl_print_cmdline(void) {
if (i == 0 || buffer[i - 1] == '\0') { if (i == 0 || buffer[i - 1] == '\0') {
OKF("AFL - COMMANDLINE: argv[%d] = %s", idx++, &buffer[i]); FOKF("AFL - COMMANDLINE: argv[%d] = %s", idx++, &buffer[i]);
} }
@ -132,7 +131,7 @@ static void afl_print_cmdline(void) {
for (idx = 0; idx < nargv; idx++) { for (idx = 0; idx < nargv; idx++) {
OKF("AFL - COMMANDLINE: argv[%d] = %s", idx, argv[idx]); FOKF("AFL - COMMANDLINE: argv[%d] = %s", idx, argv[idx]);
} }
@ -148,7 +147,7 @@ static void afl_print_env(void) {
if (fd < 0) { if (fd < 0) {
WARNF("Failed to open /proc/self/cmdline, errno: (%d)", errno); FWARNF("Failed to open /proc/self/cmdline, errno: (%d)", errno);
return; return;
} }
@ -156,7 +155,7 @@ static void afl_print_env(void) {
ssize_t bytes_read = read(fd, buffer, PROC_MAX - 1); ssize_t bytes_read = read(fd, buffer, PROC_MAX - 1);
if (bytes_read < 0) { if (bytes_read < 0) {
FATAL("Failed to read /proc/self/cmdline, errno: (%d)", errno); FFATAL("Failed to read /proc/self/cmdline, errno: (%d)", errno);
} }
@ -166,7 +165,7 @@ static void afl_print_env(void) {
if (i == 0 || buffer[i - 1] == '\0') { if (i == 0 || buffer[i - 1] == '\0') {
OKF("AFL - ENVIRONMENT %3d: %s", idx++, &buffer[i]); FOKF("AFL - ENVIRONMENT %3d: %s", idx++, &buffer[i]);
} }
@ -244,9 +243,9 @@ static void intercept_main(void) {
static void intercept_main(void) { static void intercept_main(void) {
mach_port_t task = mach_task_self(); mach_port_t task = mach_task_self();
OKF("Task Id: %u", task); FOKF("Task Id: %u", task);
GumAddress entry = gum_darwin_find_entrypoint(task); GumAddress entry = gum_darwin_find_entrypoint(task);
OKF("Entry Point: 0x%016" G_GINT64_MODIFIER "x", entry); FOKF("Entry Point: 0x%016" G_GINT64_MODIFIER "x", entry);
void *main = GSIZE_TO_POINTER(entry); void *main = GSIZE_TO_POINTER(entry);
main_fn = main; main_fn = main;
intercept_hook(main, on_main, NULL); intercept_hook(main, on_main, NULL);

13
frida_mode/src/output.c
View File

@ -4,9 +4,8 @@
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "debug.h"
#include "output.h" #include "output.h"
#include "util.h"
char *output_stdout = NULL; char *output_stdout = NULL;
char *output_stderr = NULL; char *output_stderr = NULL;
@ -19,18 +18,18 @@ static void output_redirect(int fd, char *filename) {
path = g_canonicalize_filename(filename, g_get_current_dir()); path = g_canonicalize_filename(filename, g_get_current_dir());
OKF("Redirect %d -> '%s'", fd, path); FOKF("Redirect %d -> '%s'", fd, path);
int output_fd = open(path, O_RDWR | O_CREAT | O_TRUNC, int output_fd = open(path, O_RDWR | O_CREAT | O_TRUNC,
S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
g_free(path); g_free(path);
if (output_fd < 0) { FATAL("Failed to open fd(%d) error %d", fd, errno); } if (output_fd < 0) { FFATAL("Failed to open fd(%d) error %d", fd, errno); }
if (dup2(output_fd, fd) < 0) { if (dup2(output_fd, fd) < 0) {
FATAL("Failed to set fd(%d) error %d", fd, errno); FFATAL("Failed to set fd(%d) error %d", fd, errno);
} }
@ -47,8 +46,8 @@ void output_config(void) {
void output_init(void) { void output_init(void) {
OKF("Output - StdOut: %s", output_stdout); FOKF("Output - StdOut: %s", output_stdout);
OKF("Output - StdErr: %s", output_stderr); FOKF("Output - StdErr: %s", output_stderr);
output_redirect(STDOUT_FILENO, output_stdout); output_redirect(STDOUT_FILENO, output_stdout);
output_redirect(STDERR_FILENO, output_stderr); output_redirect(STDERR_FILENO, output_stderr);

27
frida_mode/src/persistent/persistent.c
View File

@ -3,7 +3,6 @@
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "config.h" #include "config.h"
#include "debug.h"
#include "entry.h" #include "entry.h"
#include "persistent.h" #include "persistent.h"
@ -31,7 +30,7 @@ void persistent_config(void) {
if (persistent_count != 0 && persistent_start == 0) { if (persistent_count != 0 && persistent_start == 0) {
FATAL( FFATAL(
"AFL_FRIDA_PERSISTENT_ADDR must be specified if " "AFL_FRIDA_PERSISTENT_ADDR must be specified if "
"AFL_FRIDA_PERSISTENT_CNT is"); "AFL_FRIDA_PERSISTENT_CNT is");
@ -40,11 +39,11 @@ void persistent_config(void) {
if (persistent_start != 0 && persistent_count == 0) persistent_count = 1000; if (persistent_start != 0 && persistent_count == 0) persistent_count = 1000;
if (persistent_start != 0 && !persistent_is_supported()) if (persistent_start != 0 && !persistent_is_supported())
FATAL("Persistent mode not supported on this architecture"); FFATAL("Persistent mode not supported on this architecture");
if (persistent_ret != 0 && persistent_start == 0) { if (persistent_ret != 0 && persistent_start == 0) {
FATAL( FFATAL(
"AFL_FRIDA_PERSISTENT_ADDR must be specified if " "AFL_FRIDA_PERSISTENT_ADDR must be specified if "
"AFL_FRIDA_PERSISTENT_RET is"); "AFL_FRIDA_PERSISTENT_RET is");
@ -54,32 +53,32 @@ void persistent_config(void) {
void *hook_obj = dlopen(hook_name, RTLD_NOW); void *hook_obj = dlopen(hook_name, RTLD_NOW);
if (hook_obj == NULL) if (hook_obj == NULL)
FATAL("Failed to load AFL_FRIDA_PERSISTENT_HOOK (%s)", hook_name); FFATAL("Failed to load AFL_FRIDA_PERSISTENT_HOOK (%s)", hook_name);
int (*afl_persistent_hook_init_ptr)(void) = int (*afl_persistent_hook_init_ptr)(void) =
dlsym(hook_obj, "afl_persistent_hook_init"); dlsym(hook_obj, "afl_persistent_hook_init");
if (afl_persistent_hook_init_ptr == NULL) if (afl_persistent_hook_init_ptr == NULL)
FATAL("Failed to find afl_persistent_hook_init in %s", hook_name); FFATAL("Failed to find afl_persistent_hook_init in %s", hook_name);
if (afl_persistent_hook_init_ptr() == 0) if (afl_persistent_hook_init_ptr() == 0)
FATAL("afl_persistent_hook_init returned a failure"); FFATAL("afl_persistent_hook_init returned a failure");
persistent_hook = persistent_hook =
(afl_persistent_hook_fn)dlsym(hook_obj, "afl_persistent_hook"); (afl_persistent_hook_fn)dlsym(hook_obj, "afl_persistent_hook");
if (persistent_hook == NULL) if (persistent_hook == NULL)
FATAL("Failed to find afl_persistent_hook in %s", hook_name); FFATAL("Failed to find afl_persistent_hook in %s", hook_name);
} }
void persistent_init(void) { void persistent_init(void) {
OKF("Instrumentation - persistent mode [%c] (0x%016" G_GINT64_MODIFIER "X)", FOKF("Instrumentation - persistent mode [%c] (0x%016" G_GINT64_MODIFIER "X)",
persistent_start == 0 ? ' ' : 'X', persistent_start); persistent_start == 0 ? ' ' : 'X', persistent_start);
OKF("Instrumentation - persistent count [%c] (%" G_GINT64_MODIFIER "d)", FOKF("Instrumentation - persistent count [%c] (%" G_GINT64_MODIFIER "d)",
persistent_start == 0 ? ' ' : 'X', persistent_count); persistent_start == 0 ? ' ' : 'X', persistent_count);
OKF("Instrumentation - hook [%s]", hook_name); FOKF("Instrumentation - hook [%s]", hook_name);
OKF("Instrumentation - persistent ret [%c] (0x%016" G_GINT64_MODIFIER "X)", FOKF("Instrumentation - persistent ret [%c] (0x%016" G_GINT64_MODIFIER "X)",
persistent_ret == 0 ? ' ' : 'X', persistent_ret); persistent_ret == 0 ? ' ' : 'X', persistent_ret);
if (persistent_hook != NULL) { __afl_sharedmem_fuzzing = 1; } if (persistent_hook != NULL) { __afl_sharedmem_fuzzing = 1; }
@ -88,7 +87,7 @@ void persistent_init(void) {
void persistent_prologue(GumStalkerOutput *output) { void persistent_prologue(GumStalkerOutput *output) {
OKF("AFL_FRIDA_PERSISTENT_ADDR reached"); FOKF("AFL_FRIDA_PERSISTENT_ADDR reached");
entry_compiled = TRUE; entry_compiled = TRUE;
ranges_exclude(); ranges_exclude();
stalker_trust(); stalker_trust();
@ -98,7 +97,7 @@ void persistent_prologue(GumStalkerOutput *output) {
void persistent_epilogue(GumStalkerOutput *output) { void persistent_epilogue(GumStalkerOutput *output) {
OKF("AFL_FRIDA_PERSISTENT_RET reached"); FOKF("AFL_FRIDA_PERSISTENT_RET reached");
persistent_epilogue_arch(output); persistent_epilogue_arch(output);
} }

6
frida_mode/src/persistent/persistent_arm32.c
View File

@ -1,7 +1,5 @@
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "debug.h"
#include "persistent.h" #include "persistent.h"
#include "util.h" #include "util.h"
@ -64,14 +62,14 @@ gboolean persistent_is_supported(void) {
void persistent_prologue_arch(GumStalkerOutput *output) { void persistent_prologue_arch(GumStalkerOutput *output) {
UNUSED_PARAMETER(output); UNUSED_PARAMETER(output);
FATAL("Persistent mode not supported on this architecture"); FFATAL("Persistent mode not supported on this architecture");
} }
void persistent_epilogue_arch(GumStalkerOutput *output) { void persistent_epilogue_arch(GumStalkerOutput *output) {
UNUSED_PARAMETER(output); UNUSED_PARAMETER(output);
FATAL("Persistent mode not supported on this architecture"); FFATAL("Persistent mode not supported on this architecture");
} }

3
frida_mode/src/persistent/persistent_arm64.c
View File

@ -2,7 +2,6 @@
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "config.h" #include "config.h"
#include "debug.h"
#include "instrument.h" #include "instrument.h"
#include "persistent.h" #include "persistent.h"
@ -325,7 +324,7 @@ void persistent_prologue_arch(GumStalkerOutput *output) {
gconstpointer loop = cw->code + 1; gconstpointer loop = cw->code + 1;
OKF("Persistent loop reached"); FOKF("Persistent loop reached");
instrument_persitent_save_regs(cw, &saved_regs); instrument_persitent_save_regs(cw, &saved_regs);

3
frida_mode/src/persistent/persistent_x64.c
View File

@ -2,7 +2,6 @@
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "config.h" #include "config.h"
#include "debug.h"
#include "instrument.h" #include "instrument.h"
#include "persistent.h" #include "persistent.h"
@ -270,7 +269,7 @@ void persistent_prologue_arch(GumStalkerOutput *output) {
gconstpointer loop = cw->code + 1; gconstpointer loop = cw->code + 1;
OKF("Persistent loop reached"); FOKF("Persistent loop reached");
/* Pop the return value */ /* Pop the return value */
gum_x86_writer_put_lea_reg_reg_offset(cw, GUM_REG_RSP, GUM_REG_RSP, 8); gum_x86_writer_put_lea_reg_reg_offset(cw, GUM_REG_RSP, GUM_REG_RSP, 8);

3
frida_mode/src/persistent/persistent_x86.c
View File

@ -1,7 +1,6 @@
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "config.h" #include "config.h"
#include "debug.h"
#include "instrument.h" #include "instrument.h"
#include "persistent.h" #include "persistent.h"
@ -210,7 +209,7 @@ void persistent_prologue_arch(GumStalkerOutput *output) {
gconstpointer loop = cw->code + 1; gconstpointer loop = cw->code + 1;
OKF("Persistent loop reached"); FOKF("Persistent loop reached");
/* Pop the return value */ /* Pop the return value */
gum_x86_writer_put_lea_reg_reg_offset(cw, GUM_REG_ESP, GUM_REG_ESP, 4); gum_x86_writer_put_lea_reg_reg_offset(cw, GUM_REG_ESP, GUM_REG_ESP, 4);

12
frida_mode/src/prefetch.c
View File

@ -4,8 +4,6 @@
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "debug.h"
#include "entry.h" #include "entry.h"
#include "intercept.h" #include "intercept.h"
#include "prefetch.h" #include "prefetch.h"
@ -122,7 +120,7 @@ static void prefetch_read_patches(void) {
if (prefetch_data->backpatch_size - offset < size) { if (prefetch_data->backpatch_size - offset < size) {
FATAL("Incomplete backpatch entry"); FFATAL("Incomplete backpatch entry");
} }
@ -180,8 +178,8 @@ static void prefetch_hook_fork(void) {
void prefetch_init(void) { void prefetch_init(void) {
OKF("Instrumentation - prefetch [%c]", prefetch_enable ? 'X' : ' '); FOKF("Instrumentation - prefetch [%c]", prefetch_enable ? 'X' : ' ');
OKF("Instrumentation - prefetch_backpatch [%c]", FOKF("Instrumentation - prefetch_backpatch [%c]",
prefetch_backpatch ? 'X' : ' '); prefetch_backpatch ? 'X' : ' ');
if (!prefetch_enable) { return; } if (!prefetch_enable) { return; }
@ -194,7 +192,7 @@ void prefetch_init(void) {
shmget(IPC_PRIVATE, sizeof(prefetch_data_t), IPC_CREAT | IPC_EXCL | 0600); shmget(IPC_PRIVATE, sizeof(prefetch_data_t), IPC_CREAT | IPC_EXCL | 0600);
if (prefetch_shm_id < 0) { if (prefetch_shm_id < 0) {
FATAL("prefetch_shm_id < 0 - errno: %d\n", errno); FFATAL("prefetch_shm_id < 0 - errno: %d\n", errno);
} }
@ -206,7 +204,7 @@ void prefetch_init(void) {
*/ */
if (shmctl(prefetch_shm_id, IPC_RMID, NULL) < 0) { if (shmctl(prefetch_shm_id, IPC_RMID, NULL) < 0) {
FATAL("shmctl (IPC_RMID) < 0 - errno: %d\n", errno); FFATAL("shmctl (IPC_RMID) < 0 - errno: %d\n", errno);
} }

47
frida_mode/src/ranges.c
View File

@ -1,7 +1,5 @@
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "debug.h"
#include "lib.h" #include "lib.h"
#include "ranges.h" #include "ranges.h"
#include "stalker.h" #include "stalker.h"
@ -37,7 +35,7 @@ static void convert_address_token(gchar *token, GumMemoryRange *range) {
if (token_count != 2) { if (token_count != 2) {
FATAL("Invalid range (should have two addresses seperated by a '-'): %s\n", FFATAL("Invalid range (should have two addresses seperated by a '-'): %s\n",
token); token);
} }
@ -47,14 +45,14 @@ static void convert_address_token(gchar *token, GumMemoryRange *range) {
if (!g_str_has_prefix(from_str, "0x")) { if (!g_str_has_prefix(from_str, "0x")) {
FATAL("Invalid range: %s - Start address should have 0x prefix: %s\n", FFATAL("Invalid range: %s - Start address should have 0x prefix: %s\n",
token, from_str); token, from_str);
} }
if (!g_str_has_prefix(to_str, "0x")) { if (!g_str_has_prefix(to_str, "0x")) {
FATAL("Invalid range: %s - End address should have 0x prefix: %s\n", token, FFATAL("Invalid range: %s - End address should have 0x prefix: %s\n", token,
to_str); to_str);
} }
@ -66,7 +64,7 @@ static void convert_address_token(gchar *token, GumMemoryRange *range) {
if (!g_ascii_isxdigit(*c)) { if (!g_ascii_isxdigit(*c)) {
FATAL("Invalid range: %s - Start address not formed of hex digits: %s\n", FFATAL("Invalid range: %s - Start address not formed of hex digits: %s\n",
token, from_str); token, from_str);
} }
@ -77,7 +75,7 @@ static void convert_address_token(gchar *token, GumMemoryRange *range) {
if (!g_ascii_isxdigit(*c)) { if (!g_ascii_isxdigit(*c)) {
FATAL("Invalid range: %s - End address not formed of hex digits: %s\n", FFATAL("Invalid range: %s - End address not formed of hex digits: %s\n",
token, to_str); token, to_str);
} }
@ -87,7 +85,7 @@ static void convert_address_token(gchar *token, GumMemoryRange *range) {
guint64 from = g_ascii_strtoull(from_str, NULL, 16); guint64 from = g_ascii_strtoull(from_str, NULL, 16);
if (from == 0) { if (from == 0) {
FATAL("Invalid range: %s - Start failed hex conversion: %s\n", token, FFATAL("Invalid range: %s - Start failed hex conversion: %s\n", token,
from_str); from_str);
} }
@ -95,13 +93,14 @@ static void convert_address_token(gchar *token, GumMemoryRange *range) {
guint64 to = g_ascii_strtoull(to_str, NULL, 16); guint64 to = g_ascii_strtoull(to_str, NULL, 16);
if (to == 0) { if (to == 0) {
FATAL("Invalid range: %s - End failed hex conversion: %s\n", token, to_str); FFATAL("Invalid range: %s - End failed hex conversion: %s\n", token,
to_str);
} }
if (from >= to) { if (from >= to) {
FATAL("Invalid range: %s - Start (0x%016" G_GINT64_MODIFIER FFATAL("Invalid range: %s - Start (0x%016" G_GINT64_MODIFIER
"x) must be less than end " "x) must be less than end "
"(0x%016" G_GINT64_MODIFIER "x)\n", "(0x%016" G_GINT64_MODIFIER "x)\n",
token, from, to); token, from, to);
@ -123,7 +122,7 @@ static gboolean convert_name_token_for_module(const GumModuleDetails *details,
if (!g_str_has_suffix(details->path, ctx->suffix)) { return true; }; if (!g_str_has_suffix(details->path, ctx->suffix)) { return true; };
OKF("Found module - prefix: %s, 0x%016" G_GINT64_MODIFIER FOKF("Found module - prefix: %s, 0x%016" G_GINT64_MODIFIER
"x-0x%016" G_GINT64_MODIFIER "x %s", "x-0x%016" G_GINT64_MODIFIER "x %s",
ctx->suffix, details->range->base_address, ctx->suffix, details->range->base_address,
details->range->base_address + details->range->size, details->path); details->range->base_address + details->range->size, details->path);
@ -140,7 +139,7 @@ static void convert_name_token(gchar *token, GumMemoryRange *range) {
convert_name_ctx_t ctx = {.suffix = suffix, .range = range, .done = false}; convert_name_ctx_t ctx = {.suffix = suffix, .range = range, .done = false};
gum_process_enumerate_modules(convert_name_token_for_module, &ctx); gum_process_enumerate_modules(convert_name_token_for_module, &ctx);
if (!ctx.done) { FATAL("Failed to resolve module: %s\n", token); } if (!ctx.done) { FFATAL("Failed to resolve module: %s\n", token); }
g_free(suffix); g_free(suffix);
} }
@ -159,7 +158,7 @@ static void convert_token(gchar *token, GumMemoryRange *range) {
} }
OKF("Converted token: %s -> 0x%016" G_GINT64_MODIFIER FOKF("Converted token: %s -> 0x%016" G_GINT64_MODIFIER
"x-0x%016" G_GINT64_MODIFIER "x\n", "x-0x%016" G_GINT64_MODIFIER "x\n",
token, range->base_address, range->base_address + range->size); token, range->base_address, range->base_address + range->size);
@ -179,7 +178,7 @@ static gboolean print_ranges_callback(const GumRangeDetails *details,
if (details->file == NULL) { if (details->file == NULL) {
OKF("MAP - 0x%016" G_GINT64_MODIFIER "x - 0x%016" G_GINT64_MODIFIER FOKF("MAP - 0x%016" G_GINT64_MODIFIER "x - 0x%016" G_GINT64_MODIFIER
"X %c%c%c", "X %c%c%c",
details->range->base_address, details->range->base_address,
details->range->base_address + details->range->size, details->range->base_address + details->range->size,
@ -189,14 +188,14 @@ static gboolean print_ranges_callback(const GumRangeDetails *details,
} else { } else {
OKF("MAP - 0x%016" G_GINT64_MODIFIER "x - 0x%016" G_GINT64_MODIFIER FOKF("MAP - 0x%016" G_GINT64_MODIFIER "x - 0x%016" G_GINT64_MODIFIER
"X %c%c%c %s(0x%016" G_GINT64_MODIFIER "x)", "X %c%c%c %s(0x%016" G_GINT64_MODIFIER "x)",
details->range->base_address, details->range->base_address,
details->range->base_address + details->range->size, details->range->base_address + details->range->size,
details->protection & GUM_PAGE_READ ? 'R' : '-', details->protection & GUM_PAGE_READ ? 'R' : '-',
details->protection & GUM_PAGE_WRITE ? 'W' : '-', details->protection & GUM_PAGE_WRITE ? 'W' : '-',
details->protection & GUM_PAGE_EXECUTE ? 'X' : '-', details->file->path, details->protection & GUM_PAGE_EXECUTE ? 'X' : '-',
details->file->offset); details->file->path, details->file->offset);
} }
@ -206,12 +205,12 @@ static gboolean print_ranges_callback(const GumRangeDetails *details,
static void print_ranges(char *key, GArray *ranges) { static void print_ranges(char *key, GArray *ranges) {
OKF("Range: %s Length: %d", key, ranges->len); FOKF("Range: %s Length: %d", key, ranges->len);
for (guint i = 0; i < ranges->len; i++) { for (guint i = 0; i < ranges->len; i++) {
GumMemoryRange *curr = &g_array_index(ranges, GumMemoryRange, i); GumMemoryRange *curr = &g_array_index(ranges, GumMemoryRange, i);
GumAddress curr_limit = curr->base_address + curr->size; GumAddress curr_limit = curr->base_address + curr->size;
OKF("Range: %s Idx: %3d - 0x%016" G_GINT64_MODIFIER FOKF("Range: %s Idx: %3d - 0x%016" G_GINT64_MODIFIER
"x-0x%016" G_GINT64_MODIFIER "x", "x-0x%016" G_GINT64_MODIFIER "x",
key, i, curr->base_address, curr_limit); key, i, curr->base_address, curr_limit);
@ -250,7 +249,7 @@ static void check_for_overlaps(GArray *array) {
GumAddress curr_limit = curr->base_address + curr->size; GumAddress curr_limit = curr->base_address + curr->size;
if (prev_limit > curr->base_address) { if (prev_limit > curr->base_address) {
FATAL("OVerlapping ranges 0x%016" G_GINT64_MODIFIER FFATAL("OVerlapping ranges 0x%016" G_GINT64_MODIFIER
"x-0x%016" G_GINT64_MODIFIER "x 0x%016" G_GINT64_MODIFIER "x-0x%016" G_GINT64_MODIFIER "x 0x%016" G_GINT64_MODIFIER
"x-0x%016" G_GINT64_MODIFIER "x", "x-0x%016" G_GINT64_MODIFIER "x",
prev->base_address, prev_limit, curr->base_address, curr_limit); prev->base_address, prev_limit, curr->base_address, curr_limit);
@ -577,13 +576,13 @@ void ranges_init(void) {
GArray * step4; GArray * step4;
GArray * step5; GArray * step5;
OKF("Ranges - Instrument jit [%c]", ranges_inst_jit ? 'X' : ' '); FOKF("Ranges - Instrument jit [%c]", ranges_inst_jit ? 'X' : ' ');
OKF("Ranges - Instrument libraries [%c]", ranges_inst_libs ? 'X' : ' '); FOKF("Ranges - Instrument libraries [%c]", ranges_inst_libs ? 'X' : ' ');
print_ranges("AFL_FRIDA_INST_RANGES", include_ranges); print_ranges("AFL_FRIDA_INST_RANGES", include_ranges);
print_ranges("AFL_FRIDA_EXCLUDE_RANGES", exclude_ranges); print_ranges("AFL_FRIDA_EXCLUDE_RANGES", exclude_ranges);
OKF("Ranges - Instrument libraries [%c]", ranges_inst_libs ? 'X' : ' '); FOKF("Ranges - Instrument libraries [%c]", ranges_inst_libs ? 'X' : ' ');
print_ranges("AFL_FRIDA_INST_RANGES", include_ranges); print_ranges("AFL_FRIDA_INST_RANGES", include_ranges);
print_ranges("AFL_FRIDA_EXCLUDE_RANGES", exclude_ranges); print_ranges("AFL_FRIDA_EXCLUDE_RANGES", exclude_ranges);
@ -660,7 +659,7 @@ void ranges_exclude() {
GumMemoryRange *r; GumMemoryRange *r;
GumStalker * stalker = stalker_get(); GumStalker * stalker = stalker_get();
OKF("Excluding ranges"); FOKF("Excluding ranges");
for (guint i = 0; i < ranges->len; i++) { for (guint i = 0; i < ranges->len; i++) {

8
frida_mode/src/seccomp/seccomp.c
View File

@ -1,7 +1,5 @@
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "debug.h"
#include "seccomp.h" #include "seccomp.h"
#include "util.h" #include "util.h"
@ -12,7 +10,7 @@ void seccomp_on_fork(void) {
if (seccomp_filename == NULL) { return; } if (seccomp_filename == NULL) { return; }
#ifdef __APPLE__ #ifdef __APPLE__
FATAL("Seccomp not supported on OSX"); FFATAL("Seccomp not supported on OSX");
#else #else
seccomp_callback_parent(); seccomp_callback_parent();
#endif #endif
@ -27,12 +25,12 @@ void seccomp_config(void) {
void seccomp_init(void) { void seccomp_init(void) {
OKF("Seccomp - file [%s]", seccomp_filename); FOKF("Seccomp - file [%s]", seccomp_filename);
if (seccomp_filename == NULL) { return; } if (seccomp_filename == NULL) { return; }
#ifdef __APPLE__ #ifdef __APPLE__
FATAL("Seccomp not supported on OSX"); FFATAL("Seccomp not supported on OSX");
#else #else
seccomp_callback_initialize(); seccomp_callback_initialize();
#endif #endif

4
frida_mode/src/seccomp/seccomp_atomic.c
View File

@ -3,13 +3,13 @@
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h> #include <stdio.h>
#include "debug.h" #include "util.h"
void seccomp_atomic_set(volatile bool *ptr, bool val) { void seccomp_atomic_set(volatile bool *ptr, bool val) {
if (!__sync_bool_compare_and_swap(ptr, !val, val)) { if (!__sync_bool_compare_and_swap(ptr, !val, val)) {
FATAL("Failed to set event"); FFATAL("Failed to set event");
} }

23
frida_mode/src/seccomp/seccomp_callback.c
View File

@ -6,8 +6,7 @@
#include <fcntl.h> #include <fcntl.h>
#include "seccomp.h" #include "seccomp.h"
#include "util.h"
#include "debug.h"
static void seccomp_callback_filter(struct seccomp_notif * req, static void seccomp_callback_filter(struct seccomp_notif * req,
struct seccomp_notif_resp *resp, struct seccomp_notif_resp *resp,
@ -35,7 +34,7 @@ static void seccomp_callback_filter(struct seccomp_notif * req,
#if !defined(__MUSL__) #if !defined(__MUSL__)
seccomp_print("FRAMES: (%u)\n", frames->len); seccomp_print("FRAMES: (%u)\n", frames->len);
char **syms = backtrace_symbols(frames->items, frames->len); char **syms = backtrace_symbols(frames->items, frames->len);
if (syms == NULL) { FATAL("Failed to get symbols"); } if (syms == NULL) { FFATAL("Failed to get symbols"); }
for (guint i = 0; i < frames->len; i++) { for (guint i = 0; i < frames->len; i++) {
@ -84,7 +83,7 @@ static void seccomp_callback_child(int signal_parent, void *ctx) {
int sock_fd = *((int *)ctx); int sock_fd = *((int *)ctx);
int fd = seccomp_socket_recv(sock_fd); int fd = seccomp_socket_recv(sock_fd);
if (close(sock_fd) < 0) { FATAL("child - close"); } if (close(sock_fd) < 0) { FFATAL("child - close"); }
seccomp_event_signal(signal_parent); seccomp_event_signal(signal_parent);
seccomp_filter_child_install(); seccomp_filter_child_install();
@ -101,18 +100,18 @@ void seccomp_callback_parent(void) {
seccomp_socket_create(sock); seccomp_socket_create(sock);
seccomp_child_run(seccomp_callback_child, sock, &child, &child_fd); seccomp_child_run(seccomp_callback_child, sock, &child, &child_fd);
if (dup2(child_fd, SECCOMP_PARENT_EVENT_FD) < 0) { FATAL("dup2"); } if (dup2(child_fd, SECCOMP_PARENT_EVENT_FD) < 0) { FFATAL("dup2"); }
if (close(child_fd) < 0) { FATAL("seccomp_on_fork - close (1)"); } if (close(child_fd) < 0) { FFATAL("seccomp_on_fork - close (1)"); }
if (close(sock[STDIN_FILENO]) < 0) { FATAL("grandparent - close (2)"); } if (close(sock[STDIN_FILENO]) < 0) { FFATAL("grandparent - close (2)"); }
int fd = seccomp_filter_install(child); int fd = seccomp_filter_install(child);
seccomp_socket_send(sock[STDOUT_FILENO], fd); seccomp_socket_send(sock[STDOUT_FILENO], fd);
if (close(sock[STDOUT_FILENO]) < 0) { FATAL("grandparent - close (3)"); } if (close(sock[STDOUT_FILENO]) < 0) { FFATAL("grandparent - close (3)"); }
if (close(fd) < 0) { FATAL("grandparent - close (4)"); } if (close(fd) < 0) { FFATAL("grandparent - close (4)"); }
seccomp_child_wait(SECCOMP_PARENT_EVENT_FD); seccomp_child_wait(SECCOMP_PARENT_EVENT_FD);
@ -125,18 +124,18 @@ void seccomp_callback_initialize(void) {
path = g_canonicalize_filename(seccomp_filename, g_get_current_dir()); path = g_canonicalize_filename(seccomp_filename, g_get_current_dir());
OKF("Seccomp - path [%s]", path); FOKF("Seccomp - path [%s]", path);
fd = open(path, O_RDWR | O_CREAT | O_TRUNC, fd = open(path, O_RDWR | O_CREAT | O_TRUNC,
S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
if (dup2(fd, SECCOMP_OUTPUT_FILE_FD) < 0) { if (dup2(fd, SECCOMP_OUTPUT_FILE_FD) < 0) {
FATAL("Failed to duplicate seccomp output file"); FFATAL("Failed to duplicate seccomp output file");
} }
if (close(fd) < 0) { FATAL("Failed to close seccomp output file fd"); } if (close(fd) < 0) { FFATAL("Failed to close seccomp output file fd"); }
g_free(path); g_free(path);

7
frida_mode/src/seccomp/seccomp_child.c
View File

@ -10,9 +10,8 @@
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#include "debug.h"
#include "seccomp.h" #include "seccomp.h"
#include "util.h"
#define SECCOMP_CHILD_STACK_SIZE (1UL << 20) #define SECCOMP_CHILD_STACK_SIZE (1UL << 20)
@ -51,11 +50,11 @@ void seccomp_child_run(seccomp_child_func_t child_func, void *ctx, pid_t *child,
char *stack = char *stack =
(char *)mmap(NULL, SECCOMP_CHILD_STACK_SIZE, PROT_READ | PROT_WRITE, (char *)mmap(NULL, SECCOMP_CHILD_STACK_SIZE, PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
if (stack == MAP_FAILED) { FATAL("mmap"); } if (stack == MAP_FAILED) { FFATAL("mmap"); }
pid_t child_pid = clone(seccomp_child_func, &stack[SECCOMP_CHILD_STACK_SIZE], pid_t child_pid = clone(seccomp_child_func, &stack[SECCOMP_CHILD_STACK_SIZE],
flags, child_ctx, NULL, NULL, NULL); flags, child_ctx, NULL, NULL, NULL);
if (child_pid < 0) { FATAL("clone"); } if (child_pid < 0) { FFATAL("clone"); }
if (child != NULL) { *child = child_pid; } if (child != NULL) { *child = child_pid; }
if (event_fd != NULL) { *event_fd = fd; } if (event_fd != NULL) { *event_fd = fd; }

11
frida_mode/src/seccomp/seccomp_event.c
View File

@ -5,14 +5,13 @@
#include <sys/syscall.h> #include <sys/syscall.h>
#include <unistd.h> #include <unistd.h>
#include "debug.h"
#include "seccomp.h" #include "seccomp.h"
#include "util.h"
int seccomp_event_create(void) { int seccomp_event_create(void) {
int fd = syscall(SYS_eventfd, 0, 0); int fd = syscall(SYS_eventfd, 0, 0);
if (fd < 0) { FATAL("seccomp_event_create"); } if (fd < 0) { FFATAL("seccomp_event_create"); }
return fd; return fd;
} }
@ -22,7 +21,7 @@ void seccomp_event_signal(int fd) {
uint64_t val = 1; uint64_t val = 1;
if (write(fd, &val, sizeof(uint64_t)) != sizeof(uint64_t)) { if (write(fd, &val, sizeof(uint64_t)) != sizeof(uint64_t)) {
FATAL("seccomp_event_signal"); FFATAL("seccomp_event_signal");
} }
@ -33,7 +32,7 @@ void seccomp_event_wait(int fd) {
uint64_t val = 1; uint64_t val = 1;
if (read(fd, &val, sizeof(uint64_t)) != sizeof(uint64_t)) { if (read(fd, &val, sizeof(uint64_t)) != sizeof(uint64_t)) {
FATAL("seccomp_event_wait"); FFATAL("seccomp_event_wait");
} }
@ -41,7 +40,7 @@ void seccomp_event_wait(int fd) {
void seccomp_event_destroy(int fd) { void seccomp_event_destroy(int fd) {
if (close(fd) < 0) { FATAL("seccomp_event_destroy"); } if (close(fd) < 0) { FFATAL("seccomp_event_destroy"); }
} }

24
frida_mode/src/seccomp/seccomp_filter.c
View File

@ -17,8 +17,6 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "debug.h"
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "seccomp.h" #include "seccomp.h"
@ -159,7 +157,7 @@ static void seccomp_filter_parent_handler(int sig, siginfo_t *info,
if (syscall(SYS_tgkill, seccomp_filter_child, seccomp_filter_child, SIGUSR1) < if (syscall(SYS_tgkill, seccomp_filter_child, seccomp_filter_child, SIGUSR1) <
0) { 0) {
FATAL("kill"); FFATAL("kill");
} }
@ -172,7 +170,7 @@ void seccomp_filter_child_install(void) {
const struct sigaction sa = {.sa_sigaction = seccomp_filter_child_handler, const struct sigaction sa = {.sa_sigaction = seccomp_filter_child_handler,
.sa_flags = SA_SIGINFO | SA_RESTART}; .sa_flags = SA_SIGINFO | SA_RESTART};
if (sigaction(SIGUSR1, &sa, NULL) < 0) { FATAL("sigaction"); } if (sigaction(SIGUSR1, &sa, NULL) < 0) { FFATAL("sigaction"); }
} }
@ -187,17 +185,17 @@ int seccomp_filter_install(pid_t child) {
.len = sizeof(filter) / sizeof(struct sock_filter), .filter = filter}; .len = sizeof(filter) / sizeof(struct sock_filter), .filter = filter};
if (sigaction(SIGUSR1, &sa, NULL) < 0) { FATAL("sigaction"); } if (sigaction(SIGUSR1, &sa, NULL) < 0) { FFATAL("sigaction"); }
if (prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0)) { if (prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0)) {
FATAL("PR_SET_NO_NEW_PRIVS %d", errno); FFATAL("PR_SET_NO_NEW_PRIVS %d", errno);
} }
int fd = syscall(SYS_seccomp, SECCOMP_SET_MODE_FILTER, int fd = syscall(SYS_seccomp, SECCOMP_SET_MODE_FILTER,
SECCOMP_FILTER_FLAG_NEW_LISTENER, &filter_prog); SECCOMP_FILTER_FLAG_NEW_LISTENER, &filter_prog);
if (fd < 0) { FATAL("SYS_seccomp %d", fd); } if (fd < 0) { FFATAL("SYS_seccomp %d", fd); }
return fd; return fd;
@ -211,19 +209,19 @@ void seccomp_filter_run(int fd, seccomp_filter_callback_t callback) {
if (syscall(SYS_seccomp, SECCOMP_GET_NOTIF_SIZES, 0, &sizes) == -1) { if (syscall(SYS_seccomp, SECCOMP_GET_NOTIF_SIZES, 0, &sizes) == -1) {
FATAL("seccomp-SECCOMP_GET_NOTIF_SIZES"); FFATAL("seccomp-SECCOMP_GET_NOTIF_SIZES");
} }
if (sizes.seccomp_notif != sizeof(struct seccomp_notif)) { if (sizes.seccomp_notif != sizeof(struct seccomp_notif)) {
FATAL("size - seccomp_notif"); FFATAL("size - seccomp_notif");
} }
if (sizes.seccomp_notif_resp != sizeof(struct seccomp_notif_resp)) { if (sizes.seccomp_notif_resp != sizeof(struct seccomp_notif_resp)) {
FATAL("size - seccomp_notif"); FFATAL("size - seccomp_notif");
} }
@ -237,7 +235,7 @@ void seccomp_filter_run(int fd, seccomp_filter_callback_t callback) {
if (ioctl(fd, SECCOMP_IOCTL_NOTIF_RECV, req) < 0) { if (ioctl(fd, SECCOMP_IOCTL_NOTIF_RECV, req) < 0) {
if (errno == EINTR) { continue; } if (errno == EINTR) { continue; }
FATAL("SECCOMP_IOCTL_NOTIF_RECV: %d\n", fd); FFATAL("SECCOMP_IOCTL_NOTIF_RECV: %d\n", fd);
} }
@ -247,14 +245,14 @@ void seccomp_filter_run(int fd, seccomp_filter_callback_t callback) {
} else { } else {
if (kill(req->pid, SIGUSR1) < 0) { FATAL("kill"); } if (kill(req->pid, SIGUSR1) < 0) { FFATAL("kill"); }
} }
if (ioctl(fd, SECCOMP_IOCTL_NOTIF_SEND, resp) < 0) { if (ioctl(fd, SECCOMP_IOCTL_NOTIF_SEND, resp) < 0) {
if (errno == ENOENT) { continue; } if (errno == ENOENT) { continue; }
OKF("SECCOMP_IOCTL_NOTIF_SEND"); FOKF("SECCOMP_IOCTL_NOTIF_SEND");
continue; continue;
} }

23
frida_mode/src/seccomp/seccomp_socket.c
View File

@ -5,9 +5,8 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <unistd.h> #include <unistd.h>
#include "debug.h"
#include "seccomp.h" #include "seccomp.h"
#include "util.h"
union cmsg { union cmsg {
@ -21,31 +20,31 @@ void seccomp_socket_create(int *sock) {
int tmp_sock[2] = {-1, -1}; int tmp_sock[2] = {-1, -1};
if (socketpair(AF_UNIX, SOCK_STREAM, 0, tmp_sock) < 0) { if (socketpair(AF_UNIX, SOCK_STREAM, 0, tmp_sock) < 0) {
FATAL("socketpair"); FFATAL("socketpair");
} }
if (dup2(tmp_sock[STDIN_FILENO], SECCOMP_SOCKET_RECV_FD) < 0) { if (dup2(tmp_sock[STDIN_FILENO], SECCOMP_SOCKET_RECV_FD) < 0) {
FATAL("seccomp_socket_create - dup2 (1)"); FFATAL("seccomp_socket_create - dup2 (1)");
} }
if (dup2(tmp_sock[STDOUT_FILENO], SECCOMP_SOCKET_SEND_FD) < 0) { if (dup2(tmp_sock[STDOUT_FILENO], SECCOMP_SOCKET_SEND_FD) < 0) {
FATAL("seccomp_socket_create - dup2 (1)"); FFATAL("seccomp_socket_create - dup2 (1)");
} }
if (close(tmp_sock[STDIN_FILENO]) < 0) { if (close(tmp_sock[STDIN_FILENO]) < 0) {
FATAL("seccomp_socket_create - close (1)"); FFATAL("seccomp_socket_create - close (1)");
} }
if (close(tmp_sock[STDOUT_FILENO]) < 0) { if (close(tmp_sock[STDOUT_FILENO]) < 0) {
FATAL("seccomp_socket_create - close (2)"); FFATAL("seccomp_socket_create - close (2)");
} }
@ -76,7 +75,7 @@ void seccomp_socket_send(int sockfd, int fd) {
memcpy(CMSG_DATA(&control_msg.hdr), &fd, sizeof(int)); memcpy(CMSG_DATA(&control_msg.hdr), &fd, sizeof(int));
if (sendmsg(sockfd, &message, 0) == -1) { FATAL("sendmsg"); } if (sendmsg(sockfd, &message, 0) == -1) { FFATAL("sendmsg"); }
} }
@ -95,23 +94,23 @@ int seccomp_socket_recv(int sockfd) {
int fd; int fd;
if (recvmsg(sockfd, &message, 0) < 0) { FATAL("recvmsg"); } if (recvmsg(sockfd, &message, 0) < 0) { FFATAL("recvmsg"); }
if (control_msg.hdr.cmsg_len != CMSG_LEN(sizeof(int))) { if (control_msg.hdr.cmsg_len != CMSG_LEN(sizeof(int))) {
FATAL("control_msg.hdr.cmsg_len"); FFATAL("control_msg.hdr.cmsg_len");
} }
if (control_msg.hdr.cmsg_level != SOL_SOCKET) { if (control_msg.hdr.cmsg_level != SOL_SOCKET) {
FATAL("control_msg.hdr.cmsg_level"); FFATAL("control_msg.hdr.cmsg_level");
} }
if (control_msg.hdr.cmsg_type != SCM_RIGHTS) { if (control_msg.hdr.cmsg_type != SCM_RIGHTS) {
FATAL("control_msg.hdr.cmsg_type"); FFATAL("control_msg.hdr.cmsg_type");
} }

7
frida_mode/src/seccomp/seccomp_syscall.c
View File

@ -3,9 +3,8 @@
#include <limits.h> #include <limits.h>
#include <stdio.h> #include <stdio.h>
#include "debug.h"
#include "seccomp.h" #include "seccomp.h"
#include "util.h"
typedef struct { typedef struct {
@ -324,10 +323,10 @@ static syscall_entry_t seccomp_syscall_table[] = {
char *seccomp_syscall_lookup(int id) { char *seccomp_syscall_lookup(int id) {
if (id < 0) { FATAL("Invalid id: %d", id); } if (id < 0) { FFATAL("Invalid id: %d", id); }
if ((uint32_t)id >= sizeof(seccomp_syscall_table) / sizeof(syscall_entry_t)) { if ((uint32_t)id >= sizeof(seccomp_syscall_table) / sizeof(syscall_entry_t)) {
FATAL("Invalid id: %d", id); FFATAL("Invalid id: %d", id);
} }

15
frida_mode/src/stalker.c
View File

@ -1,4 +1,3 @@
#include "debug.h"
#include "instrument.h" #include "instrument.h"
#include "prefetch.h" #include "prefetch.h"
@ -57,7 +56,7 @@ static void gum_afl_stalker_observer_init(GumAflStalkerObserver *self) {
void stalker_config(void) { void stalker_config(void) {
if (!gum_stalker_is_supported()) { FATAL("Failed to initialize embedded"); } if (!gum_stalker_is_supported()) { FFATAL("Failed to initialize embedded"); }
backpatch_enable = (getenv("AFL_FRIDA_INST_NO_BACKPATCH") == NULL); backpatch_enable = (getenv("AFL_FRIDA_INST_NO_BACKPATCH") == NULL);
@ -90,14 +89,14 @@ static gboolean stalker_exclude_self(const GumRangeDetails *details,
void stalker_init(void) { void stalker_init(void) {
OKF("Instrumentation - backpatch [%c]", backpatch_enable ? 'X' : ' '); FOKF("Instrumentation - backpatch [%c]", backpatch_enable ? 'X' : ' ');
OKF("Stalker - ic_entries [%u]", stalker_ic_entries); FOKF("Stalker - ic_entries [%u]", stalker_ic_entries);
#if !(defined(__x86_64__) || defined(__i386__)) #if !(defined(__x86_64__) || defined(__i386__))
if (stalker_ic_entries != 0) { if (stalker_ic_entries != 0) {
FATAL("AFL_FRIDA_STALKER_IC_ENTRIES not supported"); FFATAL("AFL_FRIDA_STALKER_IC_ENTRIES not supported");
} }
@ -112,7 +111,7 @@ void stalker_init(void) {
stalker = gum_stalker_new(); stalker = gum_stalker_new();
#endif #endif
if (stalker == NULL) { FATAL("Failed to initialize stalker"); } if (stalker == NULL) { FFATAL("Failed to initialize stalker"); }
gum_stalker_set_trust_threshold(stalker, -1); gum_stalker_set_trust_threshold(stalker, -1);
@ -123,7 +122,7 @@ void stalker_init(void) {
GumStalker *stalker_get(void) { GumStalker *stalker_get(void) {
if (stalker == NULL) { FATAL("Stalker uninitialized"); } if (stalker == NULL) { FFATAL("Stalker uninitialized"); }
return stalker; return stalker;
} }
@ -145,7 +144,7 @@ void stalker_trust(void) {
GumStalkerObserver *stalker_get_observer(void) { GumStalkerObserver *stalker_get_observer(void) {
if (observer == NULL) { FATAL("Stalker not yet initialized"); } if (observer == NULL) { FFATAL("Stalker not yet initialized"); }
return GUM_STALKER_OBSERVER(observer); return GUM_STALKER_OBSERVER(observer);
} }

15
frida_mode/src/stats/stats.c
View File

@ -8,7 +8,6 @@
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "config.h" #include "config.h"
#include "debug.h"
#include "util.h" #include "util.h"
#include "entry.h" #include "entry.h"
@ -330,12 +329,12 @@ void stats_config(void) {
void stats_init(void) { void stats_init(void) {
OKF("Stats - file [%s]", stats_filename); FOKF("Stats - file [%s]", stats_filename);
OKF("Stats - interval [%" G_GINT64_MODIFIER "u]", stats_interval); FOKF("Stats - interval [%" G_GINT64_MODIFIER "u]", stats_interval);
if (stats_interval != 0 && stats_filename == NULL) { if (stats_interval != 0 && stats_filename == NULL) {
FATAL( FFATAL(
"AFL_FRIDA_STATS_FILE must be specified if " "AFL_FRIDA_STATS_FILE must be specified if "
"AFL_FRIDA_STATS_INTERVAL is"); "AFL_FRIDA_STATS_INTERVAL is");
@ -348,18 +347,18 @@ void stats_init(void) {
char *path = g_canonicalize_filename(stats_filename, g_get_current_dir()); char *path = g_canonicalize_filename(stats_filename, g_get_current_dir());
OKF("Stats - path [%s]", path); FOKF("Stats - path [%s]", path);
stats_fd = open(path, O_RDWR | O_CREAT | O_TRUNC, stats_fd = open(path, O_RDWR | O_CREAT | O_TRUNC,
S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
if (stats_fd < 0) { FATAL("Failed to open stats file '%s'", path); } if (stats_fd < 0) { FFATAL("Failed to open stats file '%s'", path); }
g_free(path); g_free(path);
int shm_id = int shm_id =
shmget(IPC_PRIVATE, sizeof(stats_data_t), IPC_CREAT | IPC_EXCL | 0600); shmget(IPC_PRIVATE, sizeof(stats_data_t), IPC_CREAT | IPC_EXCL | 0600);
if (shm_id < 0) { FATAL("shm_id < 0 - errno: %d\n", errno); } if (shm_id < 0) { FFATAL("shm_id < 0 - errno: %d\n", errno); }
stats_data = shmat(shm_id, NULL, 0); stats_data = shmat(shm_id, NULL, 0);
g_assert(stats_data != MAP_FAILED); g_assert(stats_data != MAP_FAILED);
@ -372,7 +371,7 @@ void stats_init(void) {
*/ */
if (shmctl(shm_id, IPC_RMID, NULL) < 0) { if (shmctl(shm_id, IPC_RMID, NULL) < 0) {
FATAL("shmctl (IPC_RMID) < 0 - errno: %d\n", errno); FFATAL("shmctl (IPC_RMID) < 0 - errno: %d\n", errno);
} }

8
frida_mode/src/stats/stats_arm32.c
View File

@ -1,7 +1,5 @@
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "debug.h"
#include "stats.h" #include "stats.h"
#include "util.h" #include "util.h"
@ -9,13 +7,13 @@
void starts_arch_init(void) { void starts_arch_init(void) {
FATAL("Stats not supported on this architecture"); FFATAL("Stats not supported on this architecture");
} }
void stats_write_arch(stats_data_t *data) { void stats_write_arch(stats_data_t *data) {
FATAL("Stats not supported on this architecture"); FFATAL("Stats not supported on this architecture");
} }
@ -23,7 +21,7 @@ void stats_collect_arch(const cs_insn *instr, gboolean begin) {
UNUSED_PARAMETER(instr); UNUSED_PARAMETER(instr);
UNUSED_PARAMETER(begin); UNUSED_PARAMETER(begin);
FATAL("Stats not supported on this architecture"); FFATAL("Stats not supported on this architecture");
} }

6
frida_mode/src/stats/stats_arm64.c
View File

@ -3,8 +3,6 @@
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "debug.h"
#include "ranges.h" #include "ranges.h"
#include "stats.h" #include "stats.h"
#include "util.h" #include "util.h"
@ -48,7 +46,7 @@ void starts_arch_init(void) {
int shm_id = shmget(IPC_PRIVATE, sizeof(stats_data_arch_t), int shm_id = shmget(IPC_PRIVATE, sizeof(stats_data_arch_t),
IPC_CREAT | IPC_EXCL | 0600); IPC_CREAT | IPC_EXCL | 0600);
if (shm_id < 0) { FATAL("shm_id < 0 - errno: %d\n", errno); } if (shm_id < 0) { FFATAL("shm_id < 0 - errno: %d\n", errno); }
stats_data_arch = shmat(shm_id, NULL, 0); stats_data_arch = shmat(shm_id, NULL, 0);
g_assert(stats_data_arch != MAP_FAILED); g_assert(stats_data_arch != MAP_FAILED);
@ -58,7 +56,7 @@ void starts_arch_init(void) {
*/ */
if (shmctl(shm_id, IPC_RMID, NULL) < 0) { if (shmctl(shm_id, IPC_RMID, NULL) < 0) {
FATAL("shmctl (IPC_RMID) < 0 - errno: %d\n", errno); FFATAL("shmctl (IPC_RMID) < 0 - errno: %d\n", errno);
} }

14
frida_mode/src/stats/stats_x86_64.c
View File

@ -3,8 +3,6 @@
#include "frida-gumjs.h" #include "frida-gumjs.h"
#include "debug.h"
#include "ranges.h" #include "ranges.h"
#include "stats.h" #include "stats.h"
#include "util.h" #include "util.h"
@ -50,7 +48,7 @@ void starts_arch_init(void) {
int shm_id = shmget(IPC_PRIVATE, sizeof(stats_data_arch_t), int shm_id = shmget(IPC_PRIVATE, sizeof(stats_data_arch_t),
IPC_CREAT | IPC_EXCL | 0600); IPC_CREAT | IPC_EXCL | 0600);
if (shm_id < 0) { FATAL("shm_id < 0 - errno: %d\n", errno); } if (shm_id < 0) { FFATAL("shm_id < 0 - errno: %d\n", errno); }
stats_data_arch = shmat(shm_id, NULL, 0); stats_data_arch = shmat(shm_id, NULL, 0);
g_assert(stats_data_arch != MAP_FAILED); g_assert(stats_data_arch != MAP_FAILED);
@ -60,7 +58,7 @@ void starts_arch_init(void) {
*/ */
if (shmctl(shm_id, IPC_RMID, NULL) < 0) { if (shmctl(shm_id, IPC_RMID, NULL) < 0) {
FATAL("shmctl (IPC_RMID) < 0 - errno: %d\n", errno); FFATAL("shmctl (IPC_RMID) < 0 - errno: %d\n", errno);
} }
@ -255,7 +253,7 @@ static x86_op_type stats_get_operand_type(const cs_insn *instr) {
if (x86->op_count != 1) { if (x86->op_count != 1) {
FATAL("Unexpected operand count (%d): %s %s\n", x86->op_count, FFATAL("Unexpected operand count (%d): %s %s\n", x86->op_count,
instr->mnemonic, instr->op_str); instr->mnemonic, instr->op_str);
} }
@ -295,7 +293,7 @@ static void stats_collect_call_arch(const cs_insn *instr) {
stats_data_arch->num_call_mem++; stats_data_arch->num_call_mem++;
break; break;
default: default:
FATAL("Invalid operand type: %s %s\n", instr->mnemonic, instr->op_str); FFATAL("Invalid operand type: %s %s\n", instr->mnemonic, instr->op_str);
} }
@ -316,7 +314,7 @@ static void stats_collect_jump_arch(const cs_insn *instr) {
stats_data_arch->num_jmp_mem++; stats_data_arch->num_jmp_mem++;
break; break;
default: default:
FATAL("Invalid operand type: %s %s\n", instr->mnemonic, instr->op_str); FFATAL("Invalid operand type: %s %s\n", instr->mnemonic, instr->op_str);
} }
@ -337,7 +335,7 @@ static void stats_collect_jump_cond_arch(const cs_insn *instr) {
stats_data_arch->num_jmp_cond_mem++; stats_data_arch->num_jmp_cond_mem++;
break; break;
default: default:
FATAL("Invalid operand type: %s %s\n", instr->mnemonic, instr->op_str); FFATAL("Invalid operand type: %s %s\n", instr->mnemonic, instr->op_str);
} }

18
frida_mode/src/util.c
View File

@ -1,7 +1,5 @@
#include "util.h" #include "util.h"
#include "debug.h"
guint64 util_read_address(char *key) { guint64 util_read_address(char *key) {
char *value_str = getenv(key); char *value_str = getenv(key);
@ -66,3 +64,19 @@ guint64 util_read_num(char *key) {
} }
gboolean util_output_enabled(void) {
static gboolean initialized = FALSE;
static gboolean enabled = TRUE;
if (!initialized) {
initialized = TRUE;
if (getenv("AFL_DEBUG_CHILD") == NULL) { enabled = FALSE; }
}
return enabled;
}