ExternalVendorCode/AFLplusplus
1
0
Fork 0
mirror of https://github.com/AFLplusplus/AFLplusplus.git synced 2025-06-12 18:18:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

lkm new api

Browse Source
This commit is contained in:
Andrea Fioraldi
2020-07-28 16:31:07 +02:00
parent a22f4dd1ac
commit d64c0e8887
2 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
include/snapshot-inl.h
View File

@ -32,23 +32,26 @@
#define AFL_SNAPSHOT_IOCTL_MAGIC 44313 #define AFL_SNAPSHOT_IOCTL_MAGIC 44313
#define AFL_SNAPSHOT_EXCLUDE_VMRANGE _IOR(AFL_SNAPSHOT_IOCTL_MAGIC, 1, struct afl_snapshot_vmrange_args*) #define AFL_SNAPSHOT_IOCTL_DO _IO(AFL_SNAPSHOT_IOCTL_MAGIC, 1)
#define AFL_SNAPSHOT_INCLUDE_VMRANGE _IOR(AFL_SNAPSHOT_IOCTL_MAGIC, 2, struct afl_snapshot_vmrange_args*) #define AFL_SNAPSHOT_IOCTL_CLEAN _IO(AFL_SNAPSHOT_IOCTL_MAGIC, 2)
#define AFL_SNAPSHOT_IOCTL_TAKE _IOR(AFL_SNAPSHOT_IOCTL_MAGIC, 3, int) #define AFL_SNAPSHOT_EXCLUDE_VMRANGE \
#define AFL_SNAPSHOT_IOCTL_RESTORE _IO(AFL_SNAPSHOT_IOCTL_MAGIC, 4) _IOR(AFL_SNAPSHOT_IOCTL_MAGIC, 3, struct afl_snapshot_vmrange_args *)
#define AFL_SNAPSHOT_IOCTL_CLEAN _IO(AFL_SNAPSHOT_IOCTL_MAGIC, 5) #define AFL_SNAPSHOT_INCLUDE_VMRANGE \
_IOR(AFL_SNAPSHOT_IOCTL_MAGIC, 4, struct afl_snapshot_vmrange_args *)
#define AFL_SNAPSHOT_IOCTL_TAKE _IOR(AFL_SNAPSHOT_IOCTL_MAGIC, 5, int)
#define AFL_SNAPSHOT_IOCTL_RESTORE _IO(AFL_SNAPSHOT_IOCTL_MAGIC, 6)
// Trace new mmaped ares and unmap them on restore. // Trace new mmaped ares and unmap them on restore.
#define AFL_SNAPSHOT_MMAP 1 #define AFL_SNAPSHOT_MMAP 1
// Do not snapshot any page (by default all writeable not-shared pages // Do not snapshot any page (by default all writeable not-shared pages
// are shanpshotted. // are shanpshotted.
#define AFL_SNAPSHOT_BLOCK 2 #define AFL_SNAPSHOT_BLOCK 2
// Snapshot file descriptor state, close newly opened descriptors // Snapshot file descriptor state, close newly opened descriptors
#define AFL_SNAPSHOT_FDS 4 #define AFL_SNAPSHOT_FDS 4
// Snapshot registers state // Snapshot registers state
#define AFL_SNAPSHOT_REGS 8 #define AFL_SNAPSHOT_REGS 8
// Perform a restore when exit_group is invoked // Perform a restore when exit_group is invoked
#define AFL_SNAPSHOT_EXIT 16 #define AFL_SNAPSHOT_EXIT 16
// TODO(andrea) allow not COW snapshots (high perf on small processes) // TODO(andrea) allow not COW snapshots (high perf on small processes)
// Disable COW, restore all the snapshotted pages // Disable COW, restore all the snapshotted pages
#define AFL_SNAPSHOT_NOCOW 32 #define AFL_SNAPSHOT_NOCOW 32
@ -70,16 +73,18 @@ static int afl_snapshot_init() {
} }
static void afl_snapshot_exclude_vmrange(void* start, void* end) { static void afl_snapshot_exclude_vmrange(void *start, void *end) {
struct afl_snapshot_vmrange_args args = {(unsigned long)start, (unsigned long)end}; struct afl_snapshot_vmrange_args args = {(unsigned long)start,
(unsigned long)end};
ioctl(afl_snapshot_dev_fd, AFL_SNAPSHOT_EXCLUDE_VMRANGE, &args); ioctl(afl_snapshot_dev_fd, AFL_SNAPSHOT_EXCLUDE_VMRANGE, &args);
} }
static void afl_snapshot_include_vmrange(void* start, void* end) { static void afl_snapshot_include_vmrange(void *start, void *end) {
struct afl_snapshot_vmrange_args args = {(unsigned long)start, (unsigned long)end}; struct afl_snapshot_vmrange_args args = {(unsigned long)start,
(unsigned long)end};
ioctl(afl_snapshot_dev_fd, AFL_SNAPSHOT_INCLUDE_VMRANGE, &args); ioctl(afl_snapshot_dev_fd, AFL_SNAPSHOT_INCLUDE_VMRANGE, &args);
} }
@ -90,6 +95,12 @@ static int afl_snapshot_take(int config) {
} }
static int afl_snapshot_take(void) {
return ioctl(afl_snapshot_dev_fd, AFL_SNAPSHOT_IOCTL_DO);
}
static void afl_snapshot_restore(void) { static void afl_snapshot_restore(void) {
ioctl(afl_snapshot_dev_fd, AFL_SNAPSHOT_IOCTL_RESTORE); ioctl(afl_snapshot_dev_fd, AFL_SNAPSHOT_IOCTL_RESTORE);

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

@ -521,7 +521,12 @@ static void __afl_start_snapshots(void) {
close(FORKSRV_FD); close(FORKSRV_FD);
close(FORKSRV_FD + 1); close(FORKSRV_FD + 1);
if (!afl_snapshot_take(AFL_SNAPSHOT_MMAP | AFL_SNAPSHOT_FDS | AFL_SNAPSHOT_REGS | AFL_SNAPSHOT_EXIT)) { 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));