diff options
| author | van Hauser <vh@thc.org> | 2020-05-06 00:58:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-06 00:58:13 +0200 |
| commit | df5215783414ddda7d9f371ccef5acb2235f66d0 (patch) | |
| tree | 52ca748f7a90c9deb09d9380c19f8220f0f45105 /qemu_mode | |
| parent | c7de368dc20078116bcb2e34b0f2237127802841 (diff) | |
| parent | a13958b32b6a1d8cba6f82b0d1ad03801721e3ef (diff) | |
| download | afl++-df5215783414ddda7d9f371ccef5acb2235f66d0.tar.gz | |
Merge pull request #352 from AFLplusplus/dev
Pull to master because of crash in string compare transform
Diffstat (limited to 'qemu_mode')
| -rw-r--r-- | qemu_mode/patches/afl-qemu-cpu-inl.h | 16 | ||||
| -rw-r--r-- | qemu_mode/patches/syscall.diff | 11 |
2 files changed, 11 insertions, 16 deletions
diff --git a/qemu_mode/patches/afl-qemu-cpu-inl.h b/qemu_mode/patches/afl-qemu-cpu-inl.h index 06243141..6e9ddc3b 100644 --- a/qemu_mode/patches/afl-qemu-cpu-inl.h +++ b/qemu_mode/patches/afl-qemu-cpu-inl.h @@ -275,20 +275,6 @@ void afl_setup(void) { } -static void print_mappings(void) { - - u8 buf[MAX_LINE]; - FILE *f = fopen("/proc/self/maps", "r"); - - if (!f) return; - - while (fgets(buf, MAX_LINE, f)) - printf("%s", buf); - - fclose(f); - -} - /* Fork server logic, invoked once we hit _start. */ void afl_forkserver(CPUState *cpu) { @@ -299,7 +285,7 @@ void afl_forkserver(CPUState *cpu) { if (forkserver_installed == 1) return; forkserver_installed = 1; - if (getenv("AFL_QEMU_DEBUG_MAPS")) print_mappings(); + if (getenv("AFL_QEMU_DEBUG_MAPS")) open_self_maps(cpu->env_ptr, 0); // if (!afl_area_ptr) return; // not necessary because of fixed dummy buffer diff --git a/qemu_mode/patches/syscall.diff b/qemu_mode/patches/syscall.diff index 775fc9e0..b8c5ff39 100644 --- a/qemu_mode/patches/syscall.diff +++ b/qemu_mode/patches/syscall.diff @@ -1,5 +1,5 @@ diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index b13a170e..4af79175 100644 +index b13a170e..3f5cc902 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -111,6 +111,9 @@ @@ -43,6 +43,15 @@ index b13a170e..4af79175 100644 ts = (TaskState *)cpu->opaque; if (flags & CLONE_SETTLS) cpu_set_tls (env, newtls); +@@ -6554,7 +6558,7 @@ static int open_self_cmdline(void *cpu_env, int fd) + return 0; + } + +-static int open_self_maps(void *cpu_env, int fd) ++int open_self_maps(void *cpu_env, int fd) + { + CPUState *cpu = ENV_GET_CPU((CPUArchState *)cpu_env); + TaskState *ts = cpu->opaque; @@ -7324,10 +7328,12 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, #ifdef TARGET_NR_stime /* not on alpha */ case TARGET_NR_stime: |