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

add extended forkserver feature to gcc_plugin and qemu_mode

Browse Source
This commit is contained in:
van Hauser 2020-04-11 08:15:42 +02:00
parent 32ba60185e
commit d8947d1fa4
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc_plugin/afl-gcc-rt.o.c
View File

@ -139,6 +139,7 @@ static void __afl_map_shm(void) {
static void __afl_start_forkserver(void) { static void __afl_start_forkserver(void) {
u8 tmp[4] = {0, 0, 0, 0}; u8 tmp[4] = {0, 0, 0, 0};
u32 map_size = MAP_SIZE;
s32 child_pid; s32 child_pid;
u8 child_stopped = 0; u8 child_stopped = 0;
@ -148,6 +149,13 @@ static void __afl_start_forkserver(void) {
/* Phone home and tell the parent that we're OK. If parent isn't there, /* Phone home and tell the parent that we're OK. If parent isn't there,
assume we're not running in forkserver mode and just execute program. */ assume we're not running in forkserver mode and just execute program. */
if (MAP_SIZE <= 0x800000) {
map_size = (FS_OPT_ENABLED | FS_OPT_MAPSIZE | FS_OPT_SET_MAPSIZE(MAP_SIZE));
memcpy(tmp, &map_size, 4);
}
if (write(FORKSRV_FD + 1, tmp, 4) != 4) return; if (write(FORKSRV_FD + 1, tmp, 4) != 4) return;
while (1) { while (1) {

10
qemu_mode/patches/afl-qemu-cpu-inl.h
View File

@ -293,6 +293,7 @@ static void print_mappings(void) {
void afl_forkserver(CPUState *cpu) { void afl_forkserver(CPUState *cpu) {
u32 map_size = 0;
static unsigned char tmp[4] = {0, 0, 0, 0}; static unsigned char tmp[4] = {0, 0, 0, 0};
if (forkserver_installed == 1) return; if (forkserver_installed == 1) return;
@ -306,6 +307,15 @@ void afl_forkserver(CPUState *cpu) {
int t_fd[2]; int t_fd[2];
u8 child_stopped = 0; u8 child_stopped = 0;
// if in the future qemu has non-collding coverage then switch MAP_SIZE
// with the max ID value
if (MAP_SIZE <= 0x800000) {
map_size = (FS_OPT_ENABLED | FS_OPT_MAPSIZE | FS_OPT_SET_MAPSIZE(MAP_SIZE));
memcpy(tmp, &map_size, 4);
}
/* Tell the parent that we're alive. If the parent doesn't want /* Tell the parent that we're alive. If the parent doesn't want
to talk, assume that we're not running in forkserver mode. */ to talk, assume that we're not running in forkserver mode. */