This commit is contained in:
vanhauser-thc
2021-04-29 09:12:21 +02:00
parent 26b84e3521
commit 29dbe665a7
2 changed files with 5 additions and 2 deletions

View File

@ -1358,6 +1358,7 @@ int main(int argc, char **argv_orig, char **envp) {
afl_preload = getenv("AFL_PRELOAD"); afl_preload = getenv("AFL_PRELOAD");
u8 *frida_binary = find_afl_binary(argv[0], "afl-frida-trace.so"); u8 *frida_binary = find_afl_binary(argv[0], "afl-frida-trace.so");
OKF("Injecting %s ...", frida_binary);
if (afl_preload) { if (afl_preload) {
frida_afl_preload = alloc_printf("%s:%s", afl_preload, frida_binary); frida_afl_preload = alloc_printf("%s:%s", afl_preload, frida_binary);
@ -1383,6 +1384,7 @@ int main(int argc, char **argv_orig, char **envp) {
} else if (afl->fsrv.frida_mode) { } else if (afl->fsrv.frida_mode) {
u8 *frida_binary = find_afl_binary(argv[0], "afl-frida-trace.so"); u8 *frida_binary = find_afl_binary(argv[0], "afl-frida-trace.so");
OKF("Injecting %s ...", frida_binary);
setenv("LD_PRELOAD", frida_binary, 1); setenv("LD_PRELOAD", frida_binary, 1);
setenv("DYLD_INSERT_LIBRARIES", frida_binary, 1); setenv("DYLD_INSERT_LIBRARIES", frida_binary, 1);
ck_free(frida_binary); ck_free(frida_binary);

View File

@ -504,7 +504,7 @@ __attribute__((constructor)) void __dislocator_init(void) {
if (tmp) { if (tmp) {
char *tok; char * tok;
unsigned long long mmem = strtoull(tmp, &tok, 10); unsigned long long mmem = strtoull(tmp, &tok, 10);
if (*tok != '\0' || errno == ERANGE || mmem > SIZE_MAX / 1024 / 1024) if (*tok != '\0' || errno == ERANGE || mmem > SIZE_MAX / 1024 / 1024)
FATAL("Bad value for AFL_LD_LIMIT_MB"); FATAL("Bad value for AFL_LD_LIMIT_MB");
@ -550,3 +550,4 @@ void *erealloc(void *ptr, size_t len) {
return realloc(ptr, len); return realloc(ptr, len);
} }