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

fix MMAP

Browse Source
This commit is contained in:
van Hauser
2020-12-11 11:19:26 +01:00
parent 8a1acac559
commit 2bf68a0bf4
4 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
GNUmakefile.llvm
View File

@ -288,13 +288,13 @@ ifeq "$(shell echo '$(HASH)include <sys/ipc.h>@$(HASH)include <sys/shm.h>@int ma
SHMAT_OK=1 SHMAT_OK=1
else else
SHMAT_OK=0 SHMAT_OK=0
#CFLAGS+=-DUSEMMAP=1 CFLAGS_SAFE += -DUSEMMAP=1
LDFLAGS += -Wno-deprecated-declarations LDFLAGS += -Wno-deprecated-declarations
endif endif
ifeq "$(TEST_MMAP)" "1" ifeq "$(TEST_MMAP)" "1"
SHMAT_OK=0 SHMAT_OK=0
CFLAGS+=-DUSEMMAP=1 CFLAGS_SAFE += -DUSEMMAP=1
LDFLAGS += -Wno-deprecated-declarations LDFLAGS += -Wno-deprecated-declarations
endif endif

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

@ -1107,7 +1107,7 @@ void __sanitizer_cov_trace_pc_guard_init(uint32_t *start, uint32_t *stop) {
to avoid duplicate calls (which can happen as an artifact of the underlying to avoid duplicate calls (which can happen as an artifact of the underlying
implementation in LLVM). */ implementation in LLVM). */
*(start++) = R(MAP_SIZE - 1) + 1; *(start++) = ++__afl_final_loc;
while (start < stop) { while (start < stop) {

27
src/afl-cc.c
View File

@ -130,21 +130,6 @@ static u8 *find_object(u8 *obj, u8 *argv0) {
u8 *afl_path = getenv("AFL_PATH"); u8 *afl_path = getenv("AFL_PATH");
u8 *slash = NULL, *tmp; u8 *slash = NULL, *tmp;
/*
if (obj_path) {
tmp = alloc_printf("%s/%s", obj_path, obj);
if (debug) DEBUGF("Trying %s\n", tmp);
if (!access(tmp, R_OK)) { return tmp; }
ck_free(tmp);
}
*/
if (afl_path) { if (afl_path) {
tmp = alloc_printf("%s/%s", afl_path, obj); tmp = alloc_printf("%s/%s", afl_path, obj);
@ -906,6 +891,10 @@ static void edit_params(u32 argc, char **argv, char **envp) {
alloc_printf("-Wl,--dynamic-list=%s/dynamic_list.txt", obj_path); alloc_printf("-Wl,--dynamic-list=%s/dynamic_list.txt", obj_path);
#endif #endif
#ifdef USEMMAP
cc_params[cc_par_cnt++] = "-lrt";
#endif
} }
#endif #endif
@ -1475,9 +1464,15 @@ int main(int argc, char **argv, char **envp) {
if (have_llvm) if (have_llvm)
SAYF("afl-cc LLVM version %d with the the binary path \"%s\".\n", SAYF("afl-cc LLVM version %d with the the binary path \"%s\".\n",
LLVM_MAJOR, LLVM_BINDIR); LLVM_MAJOR, LLVM_BINDIR);
if (have_lto || have_llvm) SAYF("\n");
#endif #endif
#ifdef USEMMAP
SAYF("Compiled with shm_open support (adds -lrt when linking).\n");
#else
SAYF("Compiled with shmat support.\n");
#endif
SAYF("\n");
SAYF( SAYF(
"Do not be overwhelmed :) afl-cc uses good defaults if no options are " "Do not be overwhelmed :) afl-cc uses good defaults if no options are "
"selected.\n" "selected.\n"

8
src/afl-fuzz.c
View File

@ -230,6 +230,12 @@ static void usage(u8 *argv0, int more_help) {
SAYF("Compiled without python module support\n"); SAYF("Compiled without python module support\n");
#endif #endif
#ifdef USEMMAP
SAYF("Compiled with shm_open support.\n");
#else
SAYF("Compiled with shmat support.\n");
#endif
#ifdef ASAN_BUILD #ifdef ASAN_BUILD
SAYF("Compiled with ASAN_BUILD\n\n"); SAYF("Compiled with ASAN_BUILD\n\n");
#endif #endif
@ -254,7 +260,7 @@ static void usage(u8 *argv0, int more_help) {
SAYF("Compiled with _AFL_DOCUMENT_MUTATIONS\n\n"); SAYF("Compiled with _AFL_DOCUMENT_MUTATIONS\n\n");
#endif #endif
SAYF("For additional help please consult %s/README.md\n\n", doc_path); SAYF("For additional help please consult %s/README.md :)\n\n", doc_path);
exit(1); exit(1);
#undef PHYTON_SUPPORT #undef PHYTON_SUPPORT