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 GNUmakefile

Browse Source
This commit is contained in:
van Hauser
2020-05-13 18:20:06 +02:00
parent bd94d5fce7
commit 8cc5442401
3 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
GNUmakefile
View File

@ -211,9 +211,9 @@ ifeq "$(shell echo 'int main() { return 0;}' | $(CC) $(CFLAGS) -fsanitize=addres
endif
ifdef ASAN_BUILD
$(info Compiling ASAN version of binaries)
CFLAGS+=$(ASAN_CFLAGS)
LDFLAGS+=$(ASAN_LDFLAGS)
$(info Compiling ASAN version of binaries)
CFLAGS+=$(ASAN_CFLAGS)
LDFLAGS+=$(ASAN_LDFLAGS)
endif
ifeq "$(shell echo '$(HASH)include <sys/ipc.h>@$(HASH)include <sys/shm.h>@int main() { int _id = shmget(IPC_PRIVATE, 65536, IPC_CREAT | IPC_EXCL | 0600); shmctl(_id, IPC_RMID, 0); return 0;}' | tr @ '\n' | $(CC) $(CFLAGS) -x c - -o .test2 2>/dev/null && echo 1 || echo 0 ; rm -f .test2 )" "1"

18
src/afl-fuzz-init.c
View File

@ -1383,16 +1383,18 @@ void setup_dirs_fds(afl_state_t *afl) {
}
/*
if (afl->is_master) {
/*
if (afl->is_master) {
u8 *x = alloc_printf("%s/is_master", afl->sync_dir);
int fd = open(x, O_CREAT | O_RDWR, 0644);
if (fd < 0) FATAL("cannot create %s", x);
close(fd);
u8 *x = alloc_printf("%s/%s/is_master", afl->sync_dir, afl->sync_id);
int fd = open(x, O_CREAT | O_RDWR, 0644);
if (fd < 0) FATAL("cannot create %s", x);
free(x);
close(fd);
}
*/
}
*/
if (mkdir(afl->out_dir, 0700)) {

14
src/afl-fuzz-run.c
View File

@ -401,6 +401,20 @@ void sync_fuzzers(afl_state_t *afl) {
}
/*
// a slave only syncs from a master, a master syncs from everyone
if (likely(afl->is_slave)) {
u8 x = alloc_printf("%s/%s/is_master", afl->sync_dir, sd_ent->d_name);
int res = access(x, F_OK);
free(x);
if (res != 0)
continue;
}
*/
/* Skip anything that doesn't have a queue/ subdirectory. */
qd_path = alloc_printf("%s/%s/queue", afl->sync_dir, sd_ent->d_name);