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

fix cmplog rtn

Browse Source
This commit is contained in:
vanhauser-thc
2021-03-16 14:38:13 +01:00
parent 8e11546536
commit 862cb3217f
4 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/envs.h
View File

@ -50,6 +50,7 @@ static char *afl_environment_variables[] = {
"AFL_FAST_CAL", "AFL_FAST_CAL",
"AFL_FORCE_UI", "AFL_FORCE_UI",
"AFL_FUZZER_ARGS", // oss-fuzz "AFL_FUZZER_ARGS", // oss-fuzz
"AFL_GDB",
"AFL_GCC_ALLOWLIST", "AFL_GCC_ALLOWLIST",
"AFL_GCC_DENYLIST", "AFL_GCC_DENYLIST",
"AFL_GCC_BLOCKLIST", "AFL_GCC_BLOCKLIST",

10
instrumentation/afl-compiler-rt.o.c
View File

@ -1730,18 +1730,18 @@ __attribute__((weak)) void *__asan_region_is_poisoned(void *beg, size_t size) {
// to avoid to call it on .text addresses // to avoid to call it on .text addresses
static int area_is_valid(void *ptr, size_t len) { static int area_is_valid(void *ptr, size_t len) {
if (unlikely(__asan_region_is_poisoned(ptr, len))) { return 0; } if (unlikely(!ptr || __asan_region_is_poisoned(ptr, len))) { return 0; }
long r = syscall(__afl_dummy_fd[1], SYS_write, ptr, len); long r = syscall(SYS_write, __afl_dummy_fd[1], ptr, len);
if (unlikely(r <= 0 || r > len)) { // fail - maybe hitting asan boundary? if (unlikely(r <= 0 || r > len)) { // fail - maybe hitting asan boundary?
char *p = (char *)ptr; char *p = (char *)ptr;
long page_size = sysconf(_SC_PAGE_SIZE); long page_size = sysconf(_SC_PAGE_SIZE);
char *page = (char *)((uintptr_t)p & ~(page_size - 1)) + page_size; char *page = (char *)((uintptr_t)p & ~(page_size - 1)) + page_size;
if (page < p + len) { return 0; } // no isnt, return fail if (page >= p + len) { return 0; } // no isnt, return fail
len -= (p + len - page); len = page - p - len;
r = syscall(__afl_dummy_fd[1], SYS_write, p, len); r = syscall(SYS_write, __afl_dummy_fd[1], p, len);
} }

6
src/afl-common.c
View File

@ -150,10 +150,12 @@ void argv_cpy_free(char **argv) {
char **get_qemu_argv(u8 *own_loc, u8 **target_path_p, int argc, char **argv) { char **get_qemu_argv(u8 *own_loc, u8 **target_path_p, int argc, char **argv) {
if (unlikely(getenv("AFL_QEMU_CUSTOM_BIN"))) { if (unlikely(getenv("AFL_QEMU_CUSTOM_BIN"))) {
WARNF( WARNF(
"AFL_QEMU_CUSTOM_BIN is enabled. " "AFL_QEMU_CUSTOM_BIN is enabled. "
"You must run your target under afl-qemu-trace on your own!"); "You must run your target under afl-qemu-trace on your own!");
return argv; return argv;
} }
if (!unlikely(own_loc)) { FATAL("BUG: param own_loc is NULL"); } if (!unlikely(own_loc)) { FATAL("BUG: param own_loc is NULL"); }

10
utils/aflpp_driver/aflpp_driver.c
View File

@ -208,6 +208,16 @@ int main(int argc, char **argv) {
"======================================================\n", "======================================================\n",
argv[0], argv[0]); argv[0], argv[0]);
if (getenv("AFL_GDB")) {
char cmd[64];
snprintf(cmd, sizeof(cmd), "cat /proc/%d/maps", getpid());
system(cmd);
fprintf(stderr, "DEBUG: aflpp_driver pid is %d\n", getpid());
sleep(1);
}
output_file = stderr; output_file = stderr;
maybe_duplicate_stderr(); maybe_duplicate_stderr();
maybe_close_fd_mask(); maybe_close_fd_mask();