From 0090b3a3f01cad64a0d27c064d00eb87aa68ffef Mon Sep 17 00:00:00 2001 From: Sergej Schumilo Date: Fri, 21 Jan 2022 21:03:07 +0100 Subject: update Nyx submodules --- nyx_mode/LIBNYX_VERSION | 2 +- nyx_mode/QEMU-Nyx | 2 +- nyx_mode/QEMU_NYX_VERSION | 2 +- nyx_mode/libnyx | 2 +- nyx_mode/packer | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nyx_mode/LIBNYX_VERSION b/nyx_mode/LIBNYX_VERSION index 109c3c6f..b45b4e90 100644 --- a/nyx_mode/LIBNYX_VERSION +++ b/nyx_mode/LIBNYX_VERSION @@ -1 +1 @@ -a5ae4c1 +2e45754 diff --git a/nyx_mode/QEMU-Nyx b/nyx_mode/QEMU-Nyx index d5a7011a..c2c69cfc 160000 --- a/nyx_mode/QEMU-Nyx +++ b/nyx_mode/QEMU-Nyx @@ -1 +1 @@ -Subproject commit d5a7011ad20ba5ba91f1371f9d40154035d5d768 +Subproject commit c2c69cfc528398d9db9363b92f8c50db4008c98f diff --git a/nyx_mode/QEMU_NYX_VERSION b/nyx_mode/QEMU_NYX_VERSION index 96133165..be13a784 100644 --- a/nyx_mode/QEMU_NYX_VERSION +++ b/nyx_mode/QEMU_NYX_VERSION @@ -1 +1 @@ -902306beb0 +c2c69cfc52 diff --git a/nyx_mode/libnyx b/nyx_mode/libnyx index ecbcb2d7..2e45754e 160000 --- a/nyx_mode/libnyx +++ b/nyx_mode/libnyx @@ -1 +1 @@ -Subproject commit ecbcb2d7234fef0b5e1db8ca6019e6137ee0582d +Subproject commit 2e45754e271463f446c31a6f467231d8657910e8 diff --git a/nyx_mode/packer b/nyx_mode/packer index f91742ce..8842549b 160000 --- a/nyx_mode/packer +++ b/nyx_mode/packer @@ -1 +1 @@ -Subproject commit f91742ce6c51eee133b5675edd68f39202785db1 +Subproject commit 8842549b5612a890258dcef812276cfdb62b76c7 -- cgit 1.4.1 From 06ee6b1986dc83c65e67d827a4fdecc70942f4d1 Mon Sep 17 00:00:00 2001 From: Sergej Schumilo Date: Fri, 21 Jan 2022 21:07:28 +0100 Subject: update Nyx custom harness: use a coverage bitmap that is smaller than 64k --- nyx_mode/custom_harness/example.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nyx_mode/custom_harness/example.c b/nyx_mode/custom_harness/example.c index 00b516a2..dd268534 100644 --- a/nyx_mode/custom_harness/example.c +++ b/nyx_mode/custom_harness/example.c @@ -4,7 +4,10 @@ #include #include "nyx.h" -#define TRACE_BUFFER_SIZE (1024 * 64) +#define TRACE_BUFFER_SIZE (64) + +#define PAGE_SIZE 0x1000 +#define MMAP_SIZE(x) ((x & ~(PAGE_SIZE-1)) + PAGE_SIZE) int main(int argc, char **argv) { @@ -27,8 +30,8 @@ int main(int argc, char **argv) { /* this is our "bitmap" that is later shared with the fuzzer (you can also * pass the pointer of the bitmap used by compile-time instrumentations in * your target) */ - uint8_t *trace_buffer = mmap(NULL, TRACE_BUFFER_SIZE, PROT_READ | PROT_WRITE, - MAP_SHARED | MAP_ANONYMOUS, -1, 0); + uint8_t *trace_buffer = mmap(NULL, MMAP_SIZE(TRACE_BUFFER_SIZE), PROT_READ | + PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, -1, 0); memset(trace_buffer, 0, TRACE_BUFFER_SIZE); // makes sure that the bitmap buffer is already // mapped into the guest's memory (alternatively -- cgit 1.4.1