frida: complog -> cmplog

5 files changed, 0 insertions, 490 deletions

diff --git a/frida_mode/src/complog/complog.c b/frida_mode/src/complog/complog.c
deleted file mode 100644
index ce8a3f62..00000000
--- a/frida_mode/src/complog/complog.c
+++ /dev/null
@@ -1,76 +0,0 @@
-#include "frida-gum.h"
-
-#include "debug.h"
-#include "cmplog.h"
-#include "util.h"
-
-extern struct cmp_map *__afl_cmp_map;
-
-static GArray *complog_ranges = NULL;
-
-static gboolean complog_range(const GumRangeDetails *details,
-                              gpointer               user_data) {
-
-  UNUSED_PARAMETER(user_data);
-  GumMemoryRange range = *details->range;
-  g_array_append_val(complog_ranges, range);
-  return TRUE;
-
-}
-
-static gint complog_sort(gconstpointer a, gconstpointer b) {
-
-  return ((GumMemoryRange *)b)->base_address -
-         ((GumMemoryRange *)a)->base_address;
-
-}
-
-void complog_init(void) {
-
-  if (__afl_cmp_map != NULL) { OKF("CompLog mode enabled"); }
-
-  complog_ranges = g_array_sized_new(false, false, sizeof(GumMemoryRange), 100);
-  gum_process_enumerate_ranges(GUM_PAGE_READ, complog_range, NULL);
-  g_array_sort(complog_ranges, complog_sort);
-
-  for (guint i = 0; i < complog_ranges->len; i++) {
-
-    GumMemoryRange *range = &g_array_index(complog_ranges, GumMemoryRange, i);
-    OKF("CompLog Range - 0x%016" G_GINT64_MODIFIER
-        "X - 0x%016" G_GINT64_MODIFIER "X",
-        range->base_address, range->base_address + range->size);
-
-  }
-
-}
-
-static gboolean complog_contains(GumAddress inner_base, GumAddress inner_limit,
-                                 GumAddress outer_base,
-                                 GumAddress outer_limit) {
-
-  return (inner_base >= outer_base && inner_limit <= outer_limit);
-
-}
-
-gboolean complog_is_readable(void *addr, size_t size) {
-
-  if (complog_ranges == NULL) FATAL("CompLog not initialized");
-
-  GumAddress inner_base = GUM_ADDRESS(addr);
-  GumAddress inner_limit = inner_base + size;
-
-  for (guint i = 0; i < complog_ranges->len; i++) {
-
-    GumMemoryRange *range = &g_array_index(complog_ranges, GumMemoryRange, i);
-    GumAddress      outer_base = range->base_address;
-    GumAddress      outer_limit = outer_base + range->size;
-
-    if (complog_contains(inner_base, inner_limit, outer_base, outer_limit))
-      return true;
-
-  }
-
-  return false;
-
-}
-
diff --git a/frida_mode/src/complog/complog_arm.c b/frida_mode/src/complog/complog_arm.c
deleted file mode 100644
index 1b8eb8f1..00000000
--- a/frida_mode/src/complog/complog_arm.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "frida-gum.h"
-
-#include "debug.h"
-
-#include "complog.h"
-#include "util.h"
-
-#if defined(__arm__)
-void complog_instrument(const cs_insn *instr, GumStalkerIterator *iterator) {
-
-  UNUSED_PARAMETER(instr);
-  UNUSED_PARAMETER(iterator);
-  if (__afl_cmp_map == NULL) { return; }
-  FATAL("Complog mode not supported on this architecture");
-
-}
-
-#endif
-
diff --git a/frida_mode/src/complog/complog_arm64.c b/frida_mode/src/complog/complog_arm64.c
deleted file mode 100644
index ce62f6fd..00000000
--- a/frida_mode/src/complog/complog_arm64.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "frida-gum.h"
-
-#include "debug.h"
-
-#include "complog.h"
-#include "util.h"
-
-#if defined(__aarch64__)
-void complog_instrument(const cs_insn *instr, GumStalkerIterator *iterator) {
-
-  UNUSED_PARAMETER(instr);
-  UNUSED_PARAMETER(iterator);
-  if (__afl_cmp_map == NULL) { return; }
-  FATAL("Complog mode not supported on this architecture");
-
-}
-
-#endif
-
diff --git a/frida_mode/src/complog/complog_x64.c b/frida_mode/src/complog/complog_x64.c
deleted file mode 100644
index 28010e7f..00000000
--- a/frida_mode/src/complog/complog_x64.c
+++ /dev/null
@@ -1,357 +0,0 @@
-#include "frida-gum.h"
-
-#include "debug.h"
-#include "cmplog.h"
-
-#include "complog.h"
-#include "util.h"
-
-#if defined(__x86_64__)
-
-  #define X86_REG_8L(LABEL, REG)  \
-    case LABEL: {                 \
-                                  \
-      return REG & GUM_INT8_MASK; \
-                                  \
-    }
-
-  #define X86_REG_8H(LABEL, REG)          \
-    case LABEL: {                         \
-                                          \
-      return (REG & GUM_INT16_MASK) >> 8; \
-                                          \
-    }
-
-  #define X86_REG_16(LABEL, REG)     \
-    case LABEL: {                    \
-                                     \
-      return (REG & GUM_INT16_MASK); \
-                                     \
-    }
-
-  #define X86_REG_32(LABEL, REG)     \
-    case LABEL: {                    \
-                                     \
-      return (REG & GUM_INT32_MASK); \
-                                     \
-    }
-
-  #define X86_REG_64(LABEL, REG) \
-    case LABEL: {                \
-                                 \
-      return (REG);              \
-                                 \
-    }
-
-typedef struct {
-
-  x86_op_type type;
-  uint8_t     size;
-
-  union {
-
-    x86_op_mem mem;
-    x86_reg    reg;
-    int64_t    imm;
-
-  };
-
-} complog_ctx_t;
-
-typedef struct {
-
-  complog_ctx_t operand1;
-  complog_ctx_t operand2;
-
-} complog_pair_ctx_t;
-
-static guint64 complog_read_reg(GumX64CpuContext *ctx, x86_reg reg) {
-
-  switch (reg) {
-
-    X86_REG_8L(X86_REG_AL, ctx->rax)
-    X86_REG_8L(X86_REG_BL, ctx->rbx)
-    X86_REG_8L(X86_REG_CL, ctx->rcx)
-    X86_REG_8L(X86_REG_DL, ctx->rdx)
-    X86_REG_8L(X86_REG_BPL, ctx->rbp)
-    X86_REG_8L(X86_REG_SIL, ctx->rsi)
-    X86_REG_8L(X86_REG_DIL, ctx->rdi)
-
-    X86_REG_8H(X86_REG_AH, ctx->rax)
-    X86_REG_8H(X86_REG_BH, ctx->rbx)
-    X86_REG_8H(X86_REG_CH, ctx->rcx)
-    X86_REG_8H(X86_REG_DH, ctx->rdx)
-
-    X86_REG_16(X86_REG_AX, ctx->rax)
-    X86_REG_16(X86_REG_BX, ctx->rbx)
-    X86_REG_16(X86_REG_CX, ctx->rcx)
-    X86_REG_16(X86_REG_DX, ctx->rdx)
-    X86_REG_16(X86_REG_DI, ctx->rdi)
-    X86_REG_16(X86_REG_SI, ctx->rsi)
-    X86_REG_16(X86_REG_BP, ctx->rbp)
-
-    X86_REG_32(X86_REG_EAX, ctx->rax)
-    X86_REG_32(X86_REG_ECX, ctx->rcx)
-    X86_REG_32(X86_REG_EDX, ctx->rdx)
-    X86_REG_32(X86_REG_EBX, ctx->rbx)
-    X86_REG_32(X86_REG_ESP, ctx->rsp)
-    X86_REG_32(X86_REG_EBP, ctx->rbp)
-    X86_REG_32(X86_REG_ESI, ctx->rsi)
-    X86_REG_32(X86_REG_EDI, ctx->rdi)
-    X86_REG_32(X86_REG_R8D, ctx->r8)
-    X86_REG_32(X86_REG_R9D, ctx->r9)
-    X86_REG_32(X86_REG_R10D, ctx->r10)
-    X86_REG_32(X86_REG_R11D, ctx->r11)
-    X86_REG_32(X86_REG_R12D, ctx->r12)
-    X86_REG_32(X86_REG_R13D, ctx->r13)
-    X86_REG_32(X86_REG_R14D, ctx->r14)
-    X86_REG_32(X86_REG_R15D, ctx->r15)
-    X86_REG_32(X86_REG_EIP, ctx->rip)
-
-    X86_REG_64(X86_REG_RAX, ctx->rax)
-    X86_REG_64(X86_REG_RCX, ctx->rcx)
-    X86_REG_64(X86_REG_RDX, ctx->rdx)
-    X86_REG_64(X86_REG_RBX, ctx->rbx)
-    X86_REG_64(X86_REG_RSP, ctx->rsp)
-    X86_REG_64(X86_REG_RBP, ctx->rbp)
-    X86_REG_64(X86_REG_RSI, ctx->rsi)
-    X86_REG_64(X86_REG_RDI, ctx->rdi)
-    X86_REG_64(X86_REG_R8, ctx->r8)
-    X86_REG_64(X86_REG_R9, ctx->r9)
-    X86_REG_64(X86_REG_R10, ctx->r10)
-    X86_REG_64(X86_REG_R11, ctx->r11)
-    X86_REG_64(X86_REG_R12, ctx->r12)
-    X86_REG_64(X86_REG_R13, ctx->r13)
-    X86_REG_64(X86_REG_R14, ctx->r14)
-    X86_REG_64(X86_REG_R15, ctx->r15)
-    X86_REG_64(X86_REG_RIP, ctx->rip)
-
-    default:
-      FATAL("Failed to read register: %d", reg);
-      return 0;
-
-  }
-
-}
-
-static guint64 complog_read_mem(GumX64CpuContext *ctx, x86_op_mem *mem) {
-
-  guint64 base = 0;
-  guint64 index = 0;
-  guint64 address;
-
-  if (mem->base != X86_REG_INVALID) base = complog_read_reg(ctx, mem->base);
-
-  if (mem->index != X86_REG_INVALID) index = complog_read_reg(ctx, mem->index);
-
-  address = base + (index * mem->scale) + mem->disp;
-  return address;
-
-}
-
-static guint64 cmplog_get_operand_value(GumCpuContext *context,
-                                        complog_ctx_t *ctx) {
-
-  switch (ctx->type) {
-
-    case X86_OP_REG:
-      return complog_read_reg(context, ctx->reg);
-    case X86_OP_IMM:
-      return ctx->imm;
-    case X86_OP_MEM:
-      return complog_read_mem(context, &ctx->mem);
-    default:
-      FATAL("Invalid operand type: %d\n", ctx->type);
-
-  }
-
-}
-
-static void complog_call_callout(GumCpuContext *context, gpointer user_data) {
-
-  UNUSED_PARAMETER(user_data);
-
-  guint64 address = complog_read_reg(context, X86_REG_RIP);
-  guint64 rdi = complog_read_reg(context, X86_REG_RDI);
-  guint64 rsi = complog_read_reg(context, X86_REG_RSI);
-
-  void *ptr1 = GSIZE_TO_POINTER(rdi);
-  void *ptr2 = GSIZE_TO_POINTER(rsi);
-
-  if (!complog_is_readable(ptr1, 32) || !complog_is_readable(ptr2, 32)) return;
-
-  uintptr_t k = address;
-
-  k = (k >> 4) ^ (k << 8);
-  k &= CMP_MAP_W - 1;
-
-  __afl_cmp_map->headers[k].type = CMP_TYPE_RTN;
-
-  u32 hits = __afl_cmp_map->headers[k].hits;
-  __afl_cmp_map->headers[k].hits = hits + 1;
-
-  __afl_cmp_map->headers[k].shape = 31;
-
-  hits &= CMP_MAP_RTN_H - 1;
-  gum_memcpy(((struct cmpfn_operands *)__afl_cmp_map->log[k])[hits].v0, ptr1,
-             32);
-  gum_memcpy(((struct cmpfn_operands *)__afl_cmp_map->log[k])[hits].v1, ptr2,
-             32);
-
-}
-
-static void complog_instrument_put_operand(complog_ctx_t *ctx,
-                                           cs_x86_op *    operand) {
-
-  ctx->type = operand->type;
-  ctx->size = operand->size;
-  switch (operand->type) {
-
-    case X86_OP_REG:
-      gum_memcpy(&ctx->reg, &operand->reg, sizeof(x86_reg));
-      break;
-    case X86_OP_IMM:
-      gum_memcpy(&ctx->imm, &operand->imm, sizeof(int64_t));
-      break;
-    case X86_OP_MEM:
-      gum_memcpy(&ctx->mem, &operand->mem, sizeof(x86_op_mem));
-      break;
-    default:
-      FATAL("Invalid operand type: %d\n", operand->type);
-
-  }
-
-}
-
-static void complog_instrument_call_put_callout(GumStalkerIterator *iterator,
-                                                cs_x86_op *         operand) {
-
-  complog_ctx_t *ctx = g_malloc(sizeof(complog_ctx_t));
-  if (ctx == NULL) return;
-
-  complog_instrument_put_operand(ctx, operand);
-
-  gum_stalker_iterator_put_callout(iterator, complog_call_callout, ctx, g_free);
-
-}
-
-static void complog_instrument_call(const cs_insn *     instr,
-                                    GumStalkerIterator *iterator) {
-
-  cs_x86     x86 = instr->detail->x86;
-  cs_x86_op *operand;
-
-  if (instr->id != X86_INS_CALL) return;
-
-  if (x86.op_count != 1) return;
-
-  operand = &x86.operands[0];
-
-  if (operand->type == X86_OP_INVALID) return;
-  if (operand->type == X86_OP_MEM && operand->mem.segment != X86_REG_INVALID)
-    return;
-
-  complog_instrument_call_put_callout(iterator, operand);
-
-}
-
-static void complog_handle_cmp_sub(GumCpuContext *context, guint64 operand1,
-                                   guint64 operand2, uint8_t size) {
-
-  guint64 address = complog_read_reg(context, X86_REG_RIP);
-
-  register uintptr_t k = (uintptr_t)address;
-
-  k = (k >> 4) ^ (k << 8);
-  k &= CMP_MAP_W - 1;
-
-  __afl_cmp_map->headers[k].type = CMP_TYPE_INS;
-
-  u32 hits = __afl_cmp_map->headers[k].hits;
-  __afl_cmp_map->headers[k].hits = hits + 1;
-
-  __afl_cmp_map->headers[k].shape = (size - 1);
-
-  hits &= CMP_MAP_H - 1;
-  __afl_cmp_map->log[k][hits].v0 = operand1;
-  __afl_cmp_map->log[k][hits].v1 = operand2;
-
-}
-
-static void complog_cmp_sub_callout(GumCpuContext *context,
-                                    gpointer       user_data) {
-
-  complog_pair_ctx_t *ctx = (complog_pair_ctx_t *)user_data;
-
-  if (ctx->operand1.size != ctx->operand2.size) FATAL("Operand size mismatch");
-
-  guint64 operand1 = cmplog_get_operand_value(context, &ctx->operand1);
-  guint64 operand2 = cmplog_get_operand_value(context, &ctx->operand2);
-
-  complog_handle_cmp_sub(context, operand1, operand2, ctx->operand1.size);
-
-}
-
-static void complog_instrument_cmp_sub_put_callout(GumStalkerIterator *iterator,
-                                                   cs_x86_op *         operand1,
-                                                   cs_x86_op *operand2) {
-
-  complog_pair_ctx_t *ctx = g_malloc(sizeof(complog_pair_ctx_t));
-  if (ctx == NULL) return;
-
-  complog_instrument_put_operand(&ctx->operand1, operand1);
-  complog_instrument_put_operand(&ctx->operand2, operand2);
-
-  gum_stalker_iterator_put_callout(iterator, complog_cmp_sub_callout, ctx,
-                                   g_free);
-
-}
-
-static void complog_instrument_cmp_sub(const cs_insn *     instr,
-                                       GumStalkerIterator *iterator) {
-
-  cs_x86     x86 = instr->detail->x86;
-  cs_x86_op *operand1;
-  cs_x86_op *operand2;
-
-  switch (instr->id) {
-
-    case X86_INS_CMP:
-    case X86_INS_SUB:
-      break;
-    default:
-      return;
-
-  }
-
-  if (x86.op_count != 2) return;
-
-  operand1 = &x86.operands[0];
-  operand2 = &x86.operands[1];
-
-  if (operand1->type == X86_OP_INVALID) return;
-  if (operand2->type == X86_OP_INVALID) return;
-
-  if ((operand1->type == X86_OP_MEM) &&
-      (operand1->mem.segment != X86_REG_INVALID))
-    return;
-
-  if ((operand2->type == X86_OP_MEM) &&
-      (operand2->mem.segment != X86_REG_INVALID))
-    return;
-
-  complog_instrument_cmp_sub_put_callout(iterator, operand1, operand2);
-
-}
-
-void complog_instrument(const cs_insn *instr, GumStalkerIterator *iterator) {
-
-  if (__afl_cmp_map == NULL) return;
-
-  complog_instrument_call(instr, iterator);
-  complog_instrument_cmp_sub(instr, iterator);
-
-}
-
-#endif
-
diff --git a/frida_mode/src/complog/complog_x86.c b/frida_mode/src/complog/complog_x86.c
deleted file mode 100644
index b2e5ddcf..00000000
--- a/frida_mode/src/complog/complog_x86.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "frida-gum.h"
-
-#include "debug.h"
-
-#include "complog.h"
-#include "util.h"
-
-#if defined(__i386__)
-void complog_instrument(const cs_insn *instr, GumStalkerIterator *iterator) {
-
-  UNUSED_PARAMETER(instr);
-  UNUSED_PARAMETER(iterator);
-  if (__afl_cmp_map == NULL) { return; }
-  FATAL("Complog mode not supported on this architecture");
-
-}
-
-#endif
-