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

AFL_PRELOAD -> QEMU_SET_ENV for afl-fuzz,afl-showmap,afl-analyze,afl-tmin

Browse Source
This commit is contained in:
Andrea Fioraldi
2019-12-25 10:35:49 +01:00
parent 67b6298895
commit 9ed4bfbca8
4 changed files with 105 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/afl-analyze.c
View File

@ -82,6 +82,8 @@ static u8 edges_only, /* Ignore hit counts? */
static volatile u8 stop_soon, /* Ctrl-C pressed? */ static volatile u8 stop_soon, /* Ctrl-C pressed? */
child_timed_out; /* Child timed out? */ child_timed_out; /* Child timed out? */
static u8 qemu_mode;
/* Constants used for describing byte behavior. */ /* Constants used for describing byte behavior. */
#define RESP_NONE 0x00 /* Changing byte is a no-op. */ #define RESP_NONE 0x00 /* Changing byte is a no-op. */
@ -709,8 +711,33 @@ static void set_up_environment(void) {
if (getenv("AFL_PRELOAD")) { if (getenv("AFL_PRELOAD")) {
setenv("LD_PRELOAD", getenv("AFL_PRELOAD"), 1); if (qemu_mode) {
setenv("DYLD_INSERT_LIBRARIES", getenv("AFL_PRELOAD"), 1);
u8* qemu_preload = getenv("QEMU_SET_ENV");
u8* afl_preload = getenv("AFL_PRELOAD");
u8* buf;
s32 i, afl_preload_size = strlen(afl_preload);
for (i = 0; i < afl_preload_size; ++i) {
if (afl_preload[i] == ',')
PFATAL("Comma (',') is not allowed in AFL_PRELOAD when -Q is specified!");
}
if (qemu_preload)
buf = alloc_printf("%s,LD_PRELOAD=%s", qemu_preload, afl_preload);
else
buf = alloc_printf("LD_PRELOAD=%s", afl_preload);
setenv("QEMU_SET_ENV", buf, 1);
ck_free(buf);
} else {
setenv("LD_PRELOAD", getenv("AFL_PRELOAD"), 1);
setenv("DYLD_INSERT_LIBRARIES", getenv("AFL_PRELOAD"), 1);
}
} }
@ -835,7 +862,7 @@ static void find_binary(u8* fname) {
int main(int argc, char** argv) { int main(int argc, char** argv) {
s32 opt; s32 opt;
u8 mem_limit_given = 0, timeout_given = 0, qemu_mode = 0, unicorn_mode = 0, u8 mem_limit_given = 0, timeout_given = 0, unicorn_mode = 0,
use_wine = 0; use_wine = 0;
char** use_argv; char** use_argv;

25
src/afl-fuzz.c
View File

@ -714,22 +714,25 @@ int main(int argc, char** argv) {
if (qemu_mode) { if (qemu_mode) {
char* qemu_preload = getenv("QEMU_SET_ENV"); u8* qemu_preload = getenv("QEMU_SET_ENV");
char buf[4096]; u8* afl_preload = getenv("AFL_PRELOAD");
u8* buf;
if (qemu_preload) {
snprintf(buf, sizeof(buf), "%s,LD_PRELOAD=%s", qemu_preload,
getenv("AFL_PRELOAD"));
} else {
snprintf(buf, sizeof(buf), "LD_PRELOAD=%s", getenv("AFL_PRELOAD"));
s32 i, afl_preload_size = strlen(afl_preload);
for (i = 0; i < afl_preload_size; ++i) {
if (afl_preload[i] == ',')
PFATAL("Comma (',') is not allowed in AFL_PRELOAD when -Q is specified!");
} }
if (qemu_preload)
buf = alloc_printf("%s,LD_PRELOAD=%s", qemu_preload, afl_preload);
else
buf = alloc_printf("LD_PRELOAD=%s", afl_preload);
setenv("QEMU_SET_ENV", buf, 1); setenv("QEMU_SET_ENV", buf, 1);
ck_free(buf);
} else { } else {
setenv("LD_PRELOAD", getenv("AFL_PRELOAD"), 1); setenv("LD_PRELOAD", getenv("AFL_PRELOAD"), 1);

33
src/afl-showmap.c
View File

@ -83,6 +83,8 @@ static volatile u8 stop_soon, /* Ctrl-C pressed? */
child_timed_out, /* Child timed out? */ child_timed_out, /* Child timed out? */
child_crashed; /* Child crashed? */ child_crashed; /* Child crashed? */
static u8 qemu_mode;
/* Classify tuple counts. Instead of mapping to individual bits, as in /* Classify tuple counts. Instead of mapping to individual bits, as in
afl-fuzz.c, we map to more user-friendly numbers between 1 and 8. */ afl-fuzz.c, we map to more user-friendly numbers between 1 and 8. */
@ -358,8 +360,33 @@ static void set_up_environment(void) {
if (getenv("AFL_PRELOAD")) { if (getenv("AFL_PRELOAD")) {
setenv("LD_PRELOAD", getenv("AFL_PRELOAD"), 1); if (qemu_mode) {
setenv("DYLD_INSERT_LIBRARIES", getenv("AFL_PRELOAD"), 1);
u8* qemu_preload = getenv("QEMU_SET_ENV");
u8* afl_preload = getenv("AFL_PRELOAD");
u8* buf;
s32 i, afl_preload_size = strlen(afl_preload);
for (i = 0; i < afl_preload_size; ++i) {
if (afl_preload[i] == ',')
PFATAL("Comma (',') is not allowed in AFL_PRELOAD when -Q is specified!");
}
if (qemu_preload)
buf = alloc_printf("%s,LD_PRELOAD=%s", qemu_preload, afl_preload);
else
buf = alloc_printf("LD_PRELOAD=%s", afl_preload);
setenv("QEMU_SET_ENV", buf, 1);
ck_free(buf);
} else {
setenv("LD_PRELOAD", getenv("AFL_PRELOAD"), 1);
setenv("DYLD_INSERT_LIBRARIES", getenv("AFL_PRELOAD"), 1);
}
} }
@ -498,7 +525,7 @@ static void find_binary(u8* fname) {
int main(int argc, char** argv) { int main(int argc, char** argv) {
s32 opt; s32 opt;
u8 mem_limit_given = 0, timeout_given = 0, qemu_mode = 0, unicorn_mode = 0, u8 mem_limit_given = 0, timeout_given = 0, unicorn_mode = 0,
use_wine = 0; use_wine = 0;
u32 tcnt = 0; u32 tcnt = 0;
char** use_argv; char** use_argv;

33
src/afl-tmin.c
View File

@ -96,6 +96,8 @@ static u8 crash_mode, /* Crash-centric mode? */
static volatile u8 stop_soon; /* Ctrl-C pressed? */ static volatile u8 stop_soon; /* Ctrl-C pressed? */
static u8 qemu_mode;
/* /*
* forkserver section * forkserver section
*/ */
@ -882,8 +884,33 @@ static void set_up_environment(void) {
if (getenv("AFL_PRELOAD")) { if (getenv("AFL_PRELOAD")) {
setenv("LD_PRELOAD", getenv("AFL_PRELOAD"), 1); if (qemu_mode) {
setenv("DYLD_INSERT_LIBRARIES", getenv("AFL_PRELOAD"), 1);
u8* qemu_preload = getenv("QEMU_SET_ENV");
u8* afl_preload = getenv("AFL_PRELOAD");
u8* buf;
s32 i, afl_preload_size = strlen(afl_preload);
for (i = 0; i < afl_preload_size; ++i) {
if (afl_preload[i] == ',')
PFATAL("Comma (',') is not allowed in AFL_PRELOAD when -Q is specified!");
}
if (qemu_preload)
buf = alloc_printf("%s,LD_PRELOAD=%s", qemu_preload, afl_preload);
else
buf = alloc_printf("LD_PRELOAD=%s", afl_preload);
setenv("QEMU_SET_ENV", buf, 1);
ck_free(buf);
} else {
setenv("LD_PRELOAD", getenv("AFL_PRELOAD"), 1);
setenv("DYLD_INSERT_LIBRARIES", getenv("AFL_PRELOAD"), 1);
}
} }
@ -1026,7 +1053,7 @@ static void read_bitmap(u8* fname) {
int main(int argc, char** argv) { int main(int argc, char** argv) {
s32 opt; s32 opt;
u8 mem_limit_given = 0, timeout_given = 0, qemu_mode = 0, unicorn_mode = 0, u8 mem_limit_given = 0, timeout_given = 0, unicorn_mode = 0,
use_wine = 0; use_wine = 0;
char** use_argv; char** use_argv;