ExternalVendorCode/AFLplusplus
1
0
Fork 0
mirror of https://github.com/AFLplusplus/AFLplusplus.git synced 2025-06-08 16:21:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

new snapshot api

Browse Source
This commit is contained in:
Andrea Fioraldi 2020-07-28 16:13:32 +02:00
parent 952e5b47eb
commit a22f4dd1ac
2 changed files with 55 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
include/snapshot-inl.h
View File

@ -25,35 +25,80 @@
// From AFL-Snapshot-LKM/include/afl_snapshot.h (must be kept synced) // From AFL-Snapshot-LKM/include/afl_snapshot.h (must be kept synced)
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/types.h> #include <stdlib.h>
#include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#define AFL_SNAPSHOT_FILE_NAME "/dev/afl_snapshot" #define AFL_SNAPSHOT_FILE_NAME "/dev/afl_snapshot"
#define AFL_SNAPSHOT_IOCTL_MAGIC 44313 #define AFL_SNAPSHOT_IOCTL_MAGIC 44313
#define AFL_SNAPSHOT_IOCTL_DO _IO(AFL_SNAPSHOT_IOCTL_MAGIC, 1) #define AFL_SNAPSHOT_EXCLUDE_VMRANGE _IOR(AFL_SNAPSHOT_IOCTL_MAGIC, 1, struct afl_snapshot_vmrange_args*)
#define AFL_SNAPSHOT_IOCTL_CLEAN _IO(AFL_SNAPSHOT_IOCTL_MAGIC, 2) #define AFL_SNAPSHOT_INCLUDE_VMRANGE _IOR(AFL_SNAPSHOT_IOCTL_MAGIC, 2, struct afl_snapshot_vmrange_args*)
#define AFL_SNAPSHOT_IOCTL_TAKE _IOR(AFL_SNAPSHOT_IOCTL_MAGIC, 3, int)
#define AFL_SNAPSHOT_IOCTL_RESTORE _IO(AFL_SNAPSHOT_IOCTL_MAGIC, 4)
#define AFL_SNAPSHOT_IOCTL_CLEAN _IO(AFL_SNAPSHOT_IOCTL_MAGIC, 5)
// Trace new mmaped ares and unmap them on restore.
#define AFL_SNAPSHOT_MMAP 1
// Do not snapshot any page (by default all writeable not-shared pages
// are shanpshotted.
#define AFL_SNAPSHOT_BLOCK 2
// Snapshot file descriptor state, close newly opened descriptors
#define AFL_SNAPSHOT_FDS 4
// Snapshot registers state
#define AFL_SNAPSHOT_REGS 8
// Perform a restore when exit_group is invoked
#define AFL_SNAPSHOT_EXIT 16
// TODO(andrea) allow not COW snapshots (high perf on small processes)
// Disable COW, restore all the snapshotted pages
#define AFL_SNAPSHOT_NOCOW 32
// Do not snapshot Stack pages
#define AFL_SNAPSHOT_NOSTACK 64
struct afl_snapshot_vmrange_args {
unsigned long start, end;
};
static int afl_snapshot_dev_fd; static int afl_snapshot_dev_fd;
static int afl_snapshot_init(void) { static int afl_snapshot_init() {
afl_snapshot_dev_fd = open(AFL_SNAPSHOT_FILE_NAME, 0); afl_snapshot_dev_fd = open(AFL_SNAPSHOT_FILE_NAME, 0);
return afl_snapshot_dev_fd; return afl_snapshot_dev_fd;
} }
static int afl_snapshot_do() { static void afl_snapshot_exclude_vmrange(void* start, void* end) {
return ioctl(afl_snapshot_dev_fd, AFL_SNAPSHOT_IOCTL_DO); struct afl_snapshot_vmrange_args args = {(unsigned long)start, (unsigned long)end};
ioctl(afl_snapshot_dev_fd, AFL_SNAPSHOT_EXCLUDE_VMRANGE, &args);
} }
static int afl_snapshot_clean(void) { static void afl_snapshot_include_vmrange(void* start, void* end) {
return ioctl(afl_snapshot_dev_fd, AFL_SNAPSHOT_IOCTL_CLEAN); struct afl_snapshot_vmrange_args args = {(unsigned long)start, (unsigned long)end};
ioctl(afl_snapshot_dev_fd, AFL_SNAPSHOT_INCLUDE_VMRANGE, &args);
}
static int afl_snapshot_take(int config) {
return ioctl(afl_snapshot_dev_fd, AFL_SNAPSHOT_IOCTL_TAKE, config);
}
static void afl_snapshot_restore(void) {
ioctl(afl_snapshot_dev_fd, AFL_SNAPSHOT_IOCTL_RESTORE);
}
static void afl_snapshot_clean(void) {
ioctl(afl_snapshot_dev_fd, AFL_SNAPSHOT_IOCTL_CLEAN);
} }

2
llvm_mode/afl-llvm-rt.o.c
View File

@ -521,7 +521,7 @@ static void __afl_start_snapshots(void) {
close(FORKSRV_FD); close(FORKSRV_FD);
close(FORKSRV_FD + 1); close(FORKSRV_FD + 1);
if (!afl_snapshot_do()) { raise(SIGSTOP); } if (!afl_snapshot_take(AFL_SNAPSHOT_MMAP | AFL_SNAPSHOT_FDS | AFL_SNAPSHOT_REGS | AFL_SNAPSHOT_EXIT)) { raise(SIGSTOP); }
__afl_area_ptr[0] = 1; __afl_area_ptr[0] = 1;
memset(__afl_prev_loc, 0, NGRAM_SIZE_MAX * sizeof(PREV_LOC_T)); memset(__afl_prev_loc, 0, NGRAM_SIZE_MAX * sizeof(PREV_LOC_T));