diff options
| author | van Hauser <vh@thc.org> | 2022-01-22 00:35:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-22 00:35:07 +0100 |
| commit | 6d2b8e3ed2704d0a2eae7c3506998ae483159bd9 (patch) | |
| tree | 7fd36987d35abecefb055c104955b74e345a71cf | |
| parent | 452a4cf5be92be405620af29e81541432b60c1ae (diff) | |
| parent | 06ee6b1986dc83c65e67d827a4fdecc70942f4d1 (diff) | |
| download | afl++-6d2b8e3ed2704d0a2eae7c3506998ae483159bd9.tar.gz | |
Merge pull request #1303 from schumilo/dev
update Nyx mode submodules
| -rw-r--r-- | nyx_mode/LIBNYX_VERSION | 2 | ||||
| m--------- | nyx_mode/QEMU-Nyx | 0 | ||||
| -rw-r--r-- | nyx_mode/QEMU_NYX_VERSION | 2 | ||||
| -rw-r--r-- | nyx_mode/custom_harness/example.c | 9 | ||||
| m--------- | nyx_mode/libnyx | 0 | ||||
| m--------- | nyx_mode/packer | 0 |
6 files changed, 8 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 -Subproject d5a7011ad20ba5ba91f1371f9d40154035d5d76 +Subproject c2c69cfc528398d9db9363b92f8c50db4008c98 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/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 <inttypes.h> #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 diff --git a/nyx_mode/libnyx b/nyx_mode/libnyx -Subproject ecbcb2d7234fef0b5e1db8ca6019e6137ee0582 +Subproject 2e45754e271463f446c31a6f467231d8657910e diff --git a/nyx_mode/packer b/nyx_mode/packer -Subproject f91742ce6c51eee133b5675edd68f39202785db +Subproject 8842549b5612a890258dcef812276cfdb62b76c |