fixed c harness

1 files changed, 0 insertions, 103 deletions

diff --git a/unicorn_mode/samples/c/harness.c b/unicorn_mode/samples/c/harness.c
index b928226b..cc81ba7f 100644
--- a/unicorn_mode/samples/c/harness.c
+++ b/unicorn_mode/samples/c/harness.c
@@ -11,11 +11,7 @@
 
    $ cd <afl_path>/unicorn_mode/samples/simple/
    $ make
-<<<<<<< HEAD
    $ ../../../afl-fuzz -m none -i sample_inputs -o out -- ./harness @@
-=======
-   $ ../../../afl-fuzz -U -m none -i ./sample_inputs -o ./output -- harness @@ 
->>>>>>> 183a0e7845568def7c6c0118a7ba8128eb094200
 */
 
 // This is not your everyday Unicorn.
@@ -33,7 +29,6 @@
 #include <unicorn/unicorn.h>
 
 // Path to the file containing the binary to emulate
-<<<<<<< HEAD
 #define BINARY_FILE ("simple_target_x86_64")
 
 // Memory map for the code to be tested
@@ -53,21 +48,6 @@
 #define INPUT_SIZE_MAX (0x10000)  
 // Alignment for unicorn mappings (seems to be needed)
 #define ALIGNMENT ((uint64_t) 0x1000)
-=======
-#define BINARY_FILE ("simple_target.bin")
-
-// Memory map for the code to be tested
-// Arbitrary address where code to test will be loaded
-#define CODE_ADDRESS  (0x00100000) 
-// Max size for the code (64kb)
-#define STACK_ADDRESS (0x00200000)  
-// Size of the stack (arbitrarily chosen)
-#define STACK_SIZE	  (0x00010000)  
-// Address where mutated data will be placed
-#define DATA_ADDRESS  (0x00300000)  
-// Maximum allowable size of mutated data
-#define DATA_SIZE_MAX (0x00010000)  
->>>>>>> 183a0e7845568def7c6c0118a7ba8128eb094200
 
 static void hook_block(uc_engine *uc, uint64_t address, uint32_t size, void *user_data) {
     printf(">>> Tracing basic block at 0x%"PRIx64 ", block size = 0x%x\n", address, size);
@@ -78,7 +58,6 @@ static void hook_code(uc_engine *uc, uint64_t address, uint32_t size, void *user
     printf(">>> Tracing instruction at 0x%"PRIx64 ", instruction size = 0x%x\n", address, size);
 }
 
-<<<<<<< HEAD
 /* Unicorn page needs to be 0x1000 aligned, apparently */
 static uint64_t pad(uint64_t size) {
     if (size % ALIGNMENT == 0) return size;
@@ -89,12 +68,6 @@ static uint64_t pad(uint64_t size) {
 static off_t afl_mmap_file(char *filename, char **buf_ptr) {
 
     off_t ret = -1;
-=======
-/* returns the filesize in bytes, -1 or error. */
-static size_t afl_mmap_file(char *filename, char **buf_ptr) {
-
-    int ret = -1;
->>>>>>> 183a0e7845568def7c6c0118a7ba8128eb094200
 
     int fd = open(filename, O_RDONLY);
 
@@ -102,14 +75,11 @@ static size_t afl_mmap_file(char *filename, char **buf_ptr) {
     if (fstat(fd, &st)) goto exit;
 
     off_t in_len = st.st_size;
-<<<<<<< HEAD
     if (in_len == -1) {
 	/* This can only ever happen on 32 bit if the file is exactly 4gb. */
 	fprintf(stderr, "Filesize of %s too large", filename);
 	goto exit;
     }
-=======
->>>>>>> 183a0e7845568def7c6c0118a7ba8128eb094200
 
     *buf_ptr = mmap(0, in_len, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
 
@@ -122,11 +92,7 @@ exit:
 }
 
 /* Place the input at the right spot inside unicorn */
-<<<<<<< HEAD
 static bool place_input_callback(
-=======
-bool place_input_callback(
->>>>>>> 183a0e7845568def7c6c0118a7ba8128eb094200
     uc_engine *uc, 
     char *input, 
     size_t input_len, 
@@ -134,7 +100,6 @@ bool place_input_callback(
     void *data
 ){
     // printf("Placing input with len %ld to %x\n", input_len, DATA_ADDRESS);
-<<<<<<< HEAD
     if (input_len >= INPUT_SIZE_MAX - INPUT_OFFSET) {
         // Test input too long, ignore this testcase
         return false;
@@ -146,21 +111,6 @@ bool place_input_callback(
 static void mem_map_checked(uc_engine *uc, uint64_t addr, size_t size, uint32_t mode) {
     size = pad(size);
     //printf("SIZE %lx, align: %lx\n", size, ALIGNMENT);
-=======
-    if (input_len > DATA_SIZE_MAX) {
-        // Test input too long, ignore this testcase
-        return false;
-    }
-    uc_mem_write(uc, DATA_ADDRESS, input, input_len);
-    return true;
-}
-
-void mem_map_checked(uc_engine *uc, uint64_t addr, size_t size, uint32_t mode) {
-    // align to 0x1000
-    if (size % 0x1000 != 0) {
-        size = (size / 0x1000) + 1 * 0x1000;
-    }
->>>>>>> 183a0e7845568def7c6c0118a7ba8128eb094200
     uc_err err = uc_mem_map(uc, addr, size, mode);
     if (err != UC_ERR_OK) {
         printf("Error mapping %ld bytes at 0x%lx: %s (mode: %d)\n", size, addr, uc_strerror(err), mode);
@@ -170,11 +120,7 @@ void mem_map_checked(uc_engine *uc, uint64_t addr, size_t size, uint32_t mode) {
 
 int main(int argc, char **argv, char **envp) {
     if (argc == 1) {
-<<<<<<< HEAD
         printf("Test harness for simple_target.bin. Usage: harness [-t] <inputfile>\n");
-=======
-        printf("Test harness for simple_target.bin. Usage: harness [-t] <inputfile>");
->>>>>>> 183a0e7845568def7c6c0118a7ba8128eb094200
         exit(1);
     }
     bool tracing = false;
@@ -189,13 +135,8 @@ int main(int argc, char **argv, char **envp) {
     uc_hook hooks[2];
     char *file_contents;
 
-<<<<<<< HEAD
     // Initialize emulator in X86_64 mode
     err = uc_open(UC_ARCH_X86, UC_MODE_64, &uc);
-=======
-    // Initialize emulator in MIPS mode
-    err = uc_open(UC_ARCH_MIPS, UC_MODE_MIPS32 + UC_MODE_BIG_ENDIAN, &uc);
->>>>>>> 183a0e7845568def7c6c0118a7ba8128eb094200
     if (err) {
         printf("Failed on uc_open() with error returned: %u (%s)\n",
                 err, uc_strerror(err));
@@ -203,7 +144,6 @@ int main(int argc, char **argv, char **envp) {
     }
 
     printf("Loading data input from %s\n", BINARY_FILE);
-<<<<<<< HEAD
     off_t len = afl_mmap_file(BINARY_FILE, &file_contents);
     if (len < 0) {
         perror("Could not read binary to emulate");
@@ -221,19 +161,6 @@ int main(int argc, char **argv, char **envp) {
 
     // write machine code to be emulated to memory
     if (uc_mem_write(uc, BASE_ADDRESS, file_contents, len) != UC_ERR_OK) {
-=======
-    size_t len = afl_mmap_file(BINARY_FILE, &file_contents);
-    if (len < 0) {
-        perror("Could not read data from file.");
-        return -2;
-    }
-
-    // Map memory.
-    mem_map_checked(uc, CODE_ADDRESS, len, UC_PROT_ALL);
-
-    // write machine code to be emulated to memory
-    if (uc_mem_write(uc, CODE_ADDRESS, &file_contents, len) != UC_ERR_OK) {
->>>>>>> 183a0e7845568def7c6c0118a7ba8128eb094200
         printf("Error writing to CODE");
     }
 
@@ -242,7 +169,6 @@ int main(int argc, char **argv, char **envp) {
 
     // Set the program counter to the start of the code
     uint64_t start_address = CODE_ADDRESS;      // address of entry point of main()
-<<<<<<< HEAD
     uint64_t end_address = END_ADDRESS; // Address of last instruction in main()
     uc_reg_write(uc, UC_X86_REG_RIP, &start_address); // address of entry point of main()
     
@@ -268,29 +194,11 @@ int main(int argc, char **argv, char **envp) {
     uint64_t emulated_argc = 2;
     uc_reg_write(uc, UC_X86_REG_RDI, &emulated_argc);  // argc == 2
    
-=======
-    uint64_t end_address = CODE_ADDRESS + 0xf4; // Address of last instruction in main()
-    uc_reg_write(uc, UC_MIPS_REG_PC, &start_address); // address of entry point of main()
-    
-    // Setup the Stack
-    mem_map_checked(uc, STACK_ADDRESS, STACK_SIZE, UC_PROT_ALL);
-    uint64_t stack_val = STACK_ADDRESS + STACK_SIZE;
-    printf("%ld", stack_val);
-    uc_reg_write(uc, UC_MIPS_REG_SP, &stack_val);
-
-    // reserve some space for dat
-    mem_map_checked(uc, DATA_ADDRESS, DATA_SIZE_MAX, UC_PROT_ALL);
-
->>>>>>> 183a0e7845568def7c6c0118a7ba8128eb094200
     // If we want tracing output, set the callbacks here
     if (tracing) {
         // tracing all basic blocks with customized callback
         uc_hook_add(uc, &hooks[0], UC_HOOK_BLOCK, hook_block, NULL, 1, 0);
-<<<<<<< HEAD
         uc_hook_add(uc, &hooks[1], UC_HOOK_CODE, hook_code, NULL, BASE_ADDRESS, BASE_ADDRESS + len - 1);
-=======
-        uc_hook_add(uc, &hooks[1], UC_HOOK_CODE, hook_code, NULL, CODE_ADDRESS, CODE_ADDRESS + len - 1);
->>>>>>> 183a0e7845568def7c6c0118a7ba8128eb094200
     }
 
     printf("Starting to fuzz :)\n");
@@ -298,7 +206,6 @@ int main(int argc, char **argv, char **envp) {
 
     // let's gooo
     uc_afl_ret afl_ret = uc_afl_fuzz(
-<<<<<<< HEAD
         uc, // The unicorn instance we prepared
         filename, // Filename of the input to process. In AFL this is usually the '@@' placeholder, outside it's any input file.
         place_input_callback, // Callback that places the input (automatically loaded from the file at filename) in the unicorninstance
@@ -307,16 +214,6 @@ int main(int argc, char **argv, char **envp) {
         NULL, // Optional calback to run after each exec
         false,
         1, // For persistent mode: How many rounds to run
-=======
-        uc,
-        filename,
-        place_input_callback,
-        &end_address,
-        1,
-        NULL,
-        false,
-        1,
->>>>>>> 183a0e7845568def7c6c0118a7ba8128eb094200
         NULL
     );
     switch(afl_ret) {