mirror of
https://github.com/AFLplusplus/AFLplusplus.git
synced 2025-06-11 09:41:35 +00:00
dropped make switches
This commit is contained in:
Dominik Maier
parent
d3130ace30
commit
9b63fc758e
10
Makefile
10
Makefile
@ -65,9 +65,9 @@ ifneq "$(shell uname -m)" "x86_64"
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
CFLAGS ?= -O3 -funroll-loops $(CFLAGS_OPT)
|
CFLAGS ?= -O3 -funroll-loops $(CFLAGS_OPT)
|
||||||
override CFLAGS += -Wall -g -Wno-pointer-sign -D_FORTIFY_SOURCE=2 -I include/ \
|
override CFLAGS += -Wall -g -Wno-pointer-sign -D_FORTIFY_SOURCE=2 \
|
||||||
-DAFL_PATH=\"$(HELPER_PATH)\" -DBIN_PATH=\"$(BIN_PATH)\" \
|
-I include/ -DAFL_PATH=\"$(HELPER_PATH)\" \
|
||||||
-DDOC_PATH=\"$(DOC_PATH)\" -Wno-unused-function -fcommon
|
-DBIN_PATH=\"$(BIN_PATH)\" -DDOC_PATH=\"$(DOC_PATH)\"
|
||||||
|
|
||||||
AFL_FUZZ_FILES = $(wildcard src/afl-fuzz*.c)
|
AFL_FUZZ_FILES = $(wildcard src/afl-fuzz*.c)
|
||||||
|
|
||||||
@ -304,8 +304,8 @@ afl-tmin: src/afl-tmin.c src/afl-common.o src/afl-sharedmem.o src/afl-forkserver
|
|||||||
afl-analyze: src/afl-analyze.c src/afl-common.o src/afl-sharedmem.o $(COMM_HDR) | test_x86
|
afl-analyze: src/afl-analyze.c src/afl-common.o src/afl-sharedmem.o $(COMM_HDR) | test_x86
|
||||||
$(CC) $(CFLAGS) $(CFLAGS_FLTO) src/$@.c src/afl-common.o src/afl-sharedmem.o -o $@ $(LDFLAGS)
|
$(CC) $(CFLAGS) $(CFLAGS_FLTO) src/$@.c src/afl-common.o src/afl-sharedmem.o -o $@ $(LDFLAGS)
|
||||||
|
|
||||||
afl-gotcpu: src/afl-gotcpu.c $(COMM_HDR) | test_x86
|
afl-gotcpu: src/afl-gotcpu.c src/afl-common.o $(COMM_HDR) | test_x86
|
||||||
$(CC) $(CFLAGS) src/$@.c -o $@ $(LDFLAGS)
|
$(CC) $(CFLAGS) src/$@.c src/afl-common.o -o $@ $(LDFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# document all mutations and only do one run (use with only one input file!)
|
# document all mutations and only do one run (use with only one input file!)
|
||||||
|
|||||||
@ -967,7 +967,7 @@ static inline u32 get_rand_seed(afl_state_t *afl) {
|
|||||||
/* Find first power of two greater or equal to val (assuming val under
|
/* Find first power of two greater or equal to val (assuming val under
|
||||||
2^63). */
|
2^63). */
|
||||||
|
|
||||||
static u64 next_p2(u64 val) {
|
static inline u64 next_p2(u64 val) {
|
||||||
|
|
||||||
u64 ret = 1;
|
u64 ret = 1;
|
||||||
while (val > ret)
|
while (val > ret)
|
||||||
|
|||||||
363
include/common.h
363
include/common.h
@ -50,395 +50,54 @@ char * get_afl_env(char *env);
|
|||||||
|
|
||||||
/* Get unix time in milliseconds */
|
/* Get unix time in milliseconds */
|
||||||
|
|
||||||
static u64 get_cur_time(void) {
|
u64 get_cur_time(void);
|
||||||
|
|
||||||
struct timeval tv;
|
|
||||||
struct timezone tz;
|
|
||||||
|
|
||||||
gettimeofday(&tv, &tz);
|
|
||||||
|
|
||||||
return (tv.tv_sec * 1000ULL) + (tv.tv_usec / 1000);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Get unix time in microseconds */
|
/* Get unix time in microseconds */
|
||||||
|
|
||||||
static u64 get_cur_time_us(void) {
|
u64 get_cur_time_us(void);
|
||||||
|
|
||||||
struct timeval tv;
|
|
||||||
struct timezone tz;
|
|
||||||
|
|
||||||
gettimeofday(&tv, &tz);
|
|
||||||
|
|
||||||
return (tv.tv_sec * 1000000ULL) + tv.tv_usec;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Describe integer. The buf should be
|
/* Describe integer. The buf should be
|
||||||
at least 6 bytes to fit all ints we randomly see.
|
at least 6 bytes to fit all ints we randomly see.
|
||||||
Will return buf for convenience. */
|
Will return buf for convenience. */
|
||||||
|
|
||||||
static u8 *stringify_int(u8 *buf, size_t len, u64 val) {
|
u8 *stringify_int(u8 *buf, size_t len, u64 val);
|
||||||
\
|
|
||||||
#define CHK_FORMAT(_divisor, _limit_mult, _fmt, _cast) \
|
|
||||||
do { \
|
|
||||||
\
|
|
||||||
if (val < (_divisor) * (_limit_mult)) { \
|
|
||||||
\
|
|
||||||
snprintf(buf, len, _fmt, ((_cast)val) / (_divisor)); \
|
|
||||||
return buf; \
|
|
||||||
\
|
|
||||||
} \
|
|
||||||
\
|
|
||||||
} while (0)
|
|
||||||
|
|
||||||
/* 0-9999 */
|
|
||||||
CHK_FORMAT(1, 10000, "%llu", u64);
|
|
||||||
|
|
||||||
/* 10.0k - 99.9k */
|
|
||||||
CHK_FORMAT(1000, 99.95, "%0.01fk", double);
|
|
||||||
|
|
||||||
/* 100k - 999k */
|
|
||||||
CHK_FORMAT(1000, 1000, "%lluk", u64);
|
|
||||||
|
|
||||||
/* 1.00M - 9.99M */
|
|
||||||
CHK_FORMAT(1000 * 1000, 9.995, "%0.02fM", double);
|
|
||||||
|
|
||||||
/* 10.0M - 99.9M */
|
|
||||||
CHK_FORMAT(1000 * 1000, 99.95, "%0.01fM", double);
|
|
||||||
|
|
||||||
/* 100M - 999M */
|
|
||||||
CHK_FORMAT(1000 * 1000, 1000, "%lluM", u64);
|
|
||||||
|
|
||||||
/* 1.00G - 9.99G */
|
|
||||||
CHK_FORMAT(1000LL * 1000 * 1000, 9.995, "%0.02fG", double);
|
|
||||||
|
|
||||||
/* 10.0G - 99.9G */
|
|
||||||
CHK_FORMAT(1000LL * 1000 * 1000, 99.95, "%0.01fG", double);
|
|
||||||
|
|
||||||
/* 100G - 999G */
|
|
||||||
CHK_FORMAT(1000LL * 1000 * 1000, 1000, "%lluG", u64);
|
|
||||||
|
|
||||||
/* 1.00T - 9.99G */
|
|
||||||
CHK_FORMAT(1000LL * 1000 * 1000 * 1000, 9.995, "%0.02fT", double);
|
|
||||||
|
|
||||||
/* 10.0T - 99.9T */
|
|
||||||
CHK_FORMAT(1000LL * 1000 * 1000 * 1000, 99.95, "%0.01fT", double);
|
|
||||||
|
|
||||||
/* 100T+ */
|
|
||||||
strncpy(buf, "infty", len);
|
|
||||||
buf[len - 1] = '\0';
|
|
||||||
|
|
||||||
return buf;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Describe float. Similar as int. */
|
/* Describe float. Similar as int. */
|
||||||
|
|
||||||
static u8 *stringify_float(u8 *buf, size_t len, double val) {
|
u8 *stringify_float(u8 *buf, size_t len, double val);
|
||||||
|
|
||||||
if (val < 99.995) {
|
|
||||||
|
|
||||||
snprintf(buf, len, "%0.02f", val);
|
|
||||||
|
|
||||||
} else if (val < 999.95) {
|
|
||||||
|
|
||||||
snprintf(buf, len, "%0.01f", val);
|
|
||||||
|
|
||||||
} else {
|
|
||||||
|
|
||||||
stringify_int(buf, len, (u64)val);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
return buf;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Describe integer as memory size. */
|
/* Describe integer as memory size. */
|
||||||
|
|
||||||
static u8 *stringify_mem_size(u8 *buf, size_t len, u64 val) {
|
u8 *stringify_mem_size(u8 *buf, size_t len, u64 val);
|
||||||
|
|
||||||
/* 0-9999 */
|
|
||||||
CHK_FORMAT(1, 10000, "%llu B", u64);
|
|
||||||
|
|
||||||
/* 10.0k - 99.9k */
|
|
||||||
CHK_FORMAT(1024, 99.95, "%0.01f kB", double);
|
|
||||||
|
|
||||||
/* 100k - 999k */
|
|
||||||
CHK_FORMAT(1024, 1000, "%llu kB", u64);
|
|
||||||
|
|
||||||
/* 1.00M - 9.99M */
|
|
||||||
CHK_FORMAT(1024 * 1024, 9.995, "%0.02f MB", double);
|
|
||||||
|
|
||||||
/* 10.0M - 99.9M */
|
|
||||||
CHK_FORMAT(1024 * 1024, 99.95, "%0.01f MB", double);
|
|
||||||
|
|
||||||
/* 100M - 999M */
|
|
||||||
CHK_FORMAT(1024 * 1024, 1000, "%llu MB", u64);
|
|
||||||
|
|
||||||
/* 1.00G - 9.99G */
|
|
||||||
CHK_FORMAT(1024LL * 1024 * 1024, 9.995, "%0.02f GB", double);
|
|
||||||
|
|
||||||
/* 10.0G - 99.9G */
|
|
||||||
CHK_FORMAT(1024LL * 1024 * 1024, 99.95, "%0.01f GB", double);
|
|
||||||
|
|
||||||
/* 100G - 999G */
|
|
||||||
CHK_FORMAT(1024LL * 1024 * 1024, 1000, "%llu GB", u64);
|
|
||||||
|
|
||||||
/* 1.00T - 9.99G */
|
|
||||||
CHK_FORMAT(1024LL * 1024 * 1024 * 1024, 9.995, "%0.02f TB", double);
|
|
||||||
|
|
||||||
/* 10.0T - 99.9T */
|
|
||||||
CHK_FORMAT(1024LL * 1024 * 1024 * 1024, 99.95, "%0.01f TB", double);
|
|
||||||
|
|
||||||
#undef CHK_FORMAT
|
|
||||||
|
|
||||||
/* 100T+ */
|
|
||||||
strncpy(buf, "infty", len - 1);
|
|
||||||
buf[len - 1] = '\0';
|
|
||||||
|
|
||||||
return buf;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Describe time delta as string.
|
/* Describe time delta as string.
|
||||||
Returns a pointer to buf for convenience. */
|
Returns a pointer to buf for convenience. */
|
||||||
|
|
||||||
static u8 *stringify_time_diff(u8 *buf, size_t len, u64 cur_ms, u64 event_ms) {
|
u8 *stringify_time_diff(u8 *buf, size_t len, u64 cur_ms, u64 event_ms);
|
||||||
|
|
||||||
u64 delta;
|
|
||||||
s32 t_d, t_h, t_m, t_s;
|
|
||||||
u8 val_buf[STRINGIFY_VAL_SIZE_MAX];
|
|
||||||
|
|
||||||
if (!event_ms) {
|
|
||||||
|
|
||||||
snprintf(buf, len, "none seen yet");
|
|
||||||
|
|
||||||
} else {
|
|
||||||
|
|
||||||
delta = cur_ms - event_ms;
|
|
||||||
|
|
||||||
t_d = delta / 1000 / 60 / 60 / 24;
|
|
||||||
t_h = (delta / 1000 / 60 / 60) % 24;
|
|
||||||
t_m = (delta / 1000 / 60) % 60;
|
|
||||||
t_s = (delta / 1000) % 60;
|
|
||||||
|
|
||||||
stringify_int(val_buf, sizeof(val_buf), t_d);
|
|
||||||
snprintf(buf, len, "%s days, %d hrs, %d min, %d sec", val_buf, t_h, t_m,
|
|
||||||
t_s);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
return buf;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Unsafe Describe integer. The buf sizes are not checked.
|
/* Unsafe Describe integer. The buf sizes are not checked.
|
||||||
This is unsafe but fast.
|
This is unsafe but fast.
|
||||||
Will return buf for convenience. */
|
Will return buf for convenience. */
|
||||||
|
|
||||||
static u8 *u_stringify_int(u8 *buf, u64 val) {
|
u8 *u_stringify_int(u8 *buf, u64 val);
|
||||||
\
|
|
||||||
#define CHK_FORMAT(_divisor, _limit_mult, _fmt, _cast) \
|
|
||||||
do { \
|
|
||||||
\
|
|
||||||
if (val < (_divisor) * (_limit_mult)) { \
|
|
||||||
\
|
|
||||||
sprintf(buf, _fmt, ((_cast)val) / (_divisor)); \
|
|
||||||
return buf; \
|
|
||||||
\
|
|
||||||
} \
|
|
||||||
\
|
|
||||||
} while (0)
|
|
||||||
|
|
||||||
/* 0-9999 */
|
|
||||||
CHK_FORMAT(1, 10000, "%llu", u64);
|
|
||||||
|
|
||||||
/* 10.0k - 99.9k */
|
|
||||||
CHK_FORMAT(1000, 99.95, "%0.01fk", double);
|
|
||||||
|
|
||||||
/* 100k - 999k */
|
|
||||||
CHK_FORMAT(1000, 1000, "%lluk", u64);
|
|
||||||
|
|
||||||
/* 1.00M - 9.99M */
|
|
||||||
CHK_FORMAT(1000 * 1000, 9.995, "%0.02fM", double);
|
|
||||||
|
|
||||||
/* 10.0M - 99.9M */
|
|
||||||
CHK_FORMAT(1000 * 1000, 99.95, "%0.01fM", double);
|
|
||||||
|
|
||||||
/* 100M - 999M */
|
|
||||||
CHK_FORMAT(1000 * 1000, 1000, "%lluM", u64);
|
|
||||||
|
|
||||||
/* 1.00G - 9.99G */
|
|
||||||
CHK_FORMAT(1000LL * 1000 * 1000, 9.995, "%0.02fG", double);
|
|
||||||
|
|
||||||
/* 10.0G - 99.9G */
|
|
||||||
CHK_FORMAT(1000LL * 1000 * 1000, 99.95, "%0.01fG", double);
|
|
||||||
|
|
||||||
/* 100G - 999G */
|
|
||||||
CHK_FORMAT(1000LL * 1000 * 1000, 1000, "%lluG", u64);
|
|
||||||
|
|
||||||
/* 1.00T - 9.99G */
|
|
||||||
CHK_FORMAT(1000LL * 1000 * 1000 * 1000, 9.995, "%0.02fT", double);
|
|
||||||
|
|
||||||
/* 10.0T - 99.9T */
|
|
||||||
CHK_FORMAT(1000LL * 1000 * 1000 * 1000, 99.95, "%0.01fT", double);
|
|
||||||
|
|
||||||
/* 100T+ */
|
|
||||||
strcpy(buf, "infty");
|
|
||||||
|
|
||||||
return buf;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Unsafe describe float. Similar as unsafe int. */
|
/* Unsafe describe float. Similar as unsafe int. */
|
||||||
|
|
||||||
static u8 *u_stringify_float(u8 *buf, double val) {
|
u8 *u_stringify_float(u8 *buf, double val);
|
||||||
|
|
||||||
if (val < 99.995) {
|
|
||||||
|
|
||||||
sprintf(buf, "%0.02f", val);
|
|
||||||
|
|
||||||
} else if (val < 999.95) {
|
|
||||||
|
|
||||||
sprintf(buf, "%0.01f", val);
|
|
||||||
|
|
||||||
} else {
|
|
||||||
|
|
||||||
return u_stringify_int(buf, (u64)val);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
return buf;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Unsafe describe integer as memory size. */
|
/* Unsafe describe integer as memory size. */
|
||||||
|
|
||||||
static u8 *u_stringify_mem_size(u8 *buf, u64 val) {
|
u8 *u_stringify_mem_size(u8 *buf, u64 val);
|
||||||
|
|
||||||
/* 0-9999 */
|
|
||||||
CHK_FORMAT(1, 10000, "%llu B", u64);
|
|
||||||
|
|
||||||
/* 10.0k - 99.9k */
|
|
||||||
CHK_FORMAT(1024, 99.95, "%0.01f kB", double);
|
|
||||||
|
|
||||||
/* 100k - 999k */
|
|
||||||
CHK_FORMAT(1024, 1000, "%llu kB", u64);
|
|
||||||
|
|
||||||
/* 1.00M - 9.99M */
|
|
||||||
CHK_FORMAT(1024 * 1024, 9.995, "%0.02f MB", double);
|
|
||||||
|
|
||||||
/* 10.0M - 99.9M */
|
|
||||||
CHK_FORMAT(1024 * 1024, 99.95, "%0.01f MB", double);
|
|
||||||
|
|
||||||
/* 100M - 999M */
|
|
||||||
CHK_FORMAT(1024 * 1024, 1000, "%llu MB", u64);
|
|
||||||
|
|
||||||
/* 1.00G - 9.99G */
|
|
||||||
CHK_FORMAT(1024LL * 1024 * 1024, 9.995, "%0.02f GB", double);
|
|
||||||
|
|
||||||
/* 10.0G - 99.9G */
|
|
||||||
CHK_FORMAT(1024LL * 1024 * 1024, 99.95, "%0.01f GB", double);
|
|
||||||
|
|
||||||
/* 100G - 999G */
|
|
||||||
CHK_FORMAT(1024LL * 1024 * 1024, 1000, "%llu GB", u64);
|
|
||||||
|
|
||||||
/* 1.00T - 9.99G */
|
|
||||||
CHK_FORMAT(1024LL * 1024 * 1024 * 1024, 9.995, "%0.02f TB", double);
|
|
||||||
|
|
||||||
/* 10.0T - 99.9T */
|
|
||||||
CHK_FORMAT(1024LL * 1024 * 1024 * 1024, 99.95, "%0.01f TB", double);
|
|
||||||
|
|
||||||
#undef CHK_FORMAT
|
|
||||||
|
|
||||||
/* 100T+ */
|
|
||||||
strcpy(buf, "infty");
|
|
||||||
|
|
||||||
return buf;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Unsafe describe time delta as string.
|
/* Unsafe describe time delta as string.
|
||||||
Returns a pointer to buf for convenience. */
|
Returns a pointer to buf for convenience. */
|
||||||
|
|
||||||
static u8 *u_stringify_time_diff(u8 *buf, u64 cur_ms, u64 event_ms) {
|
u8 *u_stringify_time_diff(u8 *buf, u64 cur_ms, u64 event_ms);
|
||||||
|
|
||||||
u64 delta;
|
|
||||||
s32 t_d, t_h, t_m, t_s;
|
|
||||||
u8 val_buf[STRINGIFY_VAL_SIZE_MAX];
|
|
||||||
|
|
||||||
if (!event_ms) {
|
|
||||||
|
|
||||||
sprintf(buf, "none seen yet");
|
|
||||||
|
|
||||||
} else {
|
|
||||||
|
|
||||||
delta = cur_ms - event_ms;
|
|
||||||
|
|
||||||
t_d = delta / 1000 / 60 / 60 / 24;
|
|
||||||
t_h = (delta / 1000 / 60 / 60) % 24;
|
|
||||||
t_m = (delta / 1000 / 60) % 60;
|
|
||||||
t_s = (delta / 1000) % 60;
|
|
||||||
|
|
||||||
u_stringify_int(val_buf, t_d);
|
|
||||||
sprintf(buf, "%s days, %d hrs, %d min, %d sec", val_buf, t_h, t_m, t_s);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
return buf;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Wrapper for select() and read(), reading exactly len bytes.
|
/* Wrapper for select() and read(), reading exactly len bytes.
|
||||||
Returns the time passed to read.
|
Returns the time passed to read.
|
||||||
If the wait times out, returns timeout_ms + 1;
|
If the wait times out, returns timeout_ms + 1;
|
||||||
Returns 0 if an error occurred (fd closed, signal, ...); */
|
Returns 0 if an error occurred (fd closed, signal, ...); */
|
||||||
static inline u32 read_timed(s32 fd, void *buf, size_t len, u32 timeout_ms) {
|
u32 read_timed(s32 fd, void *buf, size_t len, u32 timeout_ms);
|
||||||
|
|
||||||
struct timeval timeout;
|
|
||||||
fd_set readfds;
|
|
||||||
FD_ZERO(&readfds);
|
|
||||||
FD_SET(fd, &readfds);
|
|
||||||
|
|
||||||
timeout.tv_sec = (timeout_ms / 1000);
|
|
||||||
timeout.tv_usec = (timeout_ms % 1000) * 1000;
|
|
||||||
|
|
||||||
size_t read_total = 0;
|
|
||||||
size_t len_read = 0;
|
|
||||||
|
|
||||||
while (len_read < len) {
|
|
||||||
|
|
||||||
/* set exceptfds as well to return when a child exited/closed the pipe. */
|
|
||||||
int sret = select(fd + 1, &readfds, NULL, NULL, &timeout);
|
|
||||||
|
|
||||||
if (!sret) {
|
|
||||||
|
|
||||||
// printf("Timeout in sret.");
|
|
||||||
return timeout_ms + 1;
|
|
||||||
|
|
||||||
} else if (sret < 0) {
|
|
||||||
|
|
||||||
// perror("sret malloc");
|
|
||||||
// TODO: catch other (errno == EINTR) than ctrl+c?
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
len_read = read(fd, ((u8 *)buf) + len_read, len - len_read);
|
|
||||||
if (!len_read) { return 0; }
|
|
||||||
read_total += len_read;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
s32 exec_ms =
|
|
||||||
MIN(timeout_ms,
|
|
||||||
((u64)timeout_ms - (timeout.tv_sec * 1000 + timeout.tv_usec / 1000)));
|
|
||||||
return exec_ms > 0 ? exec_ms
|
|
||||||
: 1; // at least 1 milli must have passed (0 is an error)
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@ -60,13 +60,13 @@ static inline element_t *get_head(list_t *list) {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void list_free_el(list_t *list, element_t *el) {
|
static inline void list_free_el(list_t *list, element_t *el) {
|
||||||
|
|
||||||
PRE_FREE(el, list->element_prealloc_count);
|
PRE_FREE(el, list->element_prealloc_count);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void list_append(list_t *list, void *el) {
|
static inline void list_append(list_t *list, void *el) {
|
||||||
|
|
||||||
element_t *head = get_head(list);
|
element_t *head = get_head(list);
|
||||||
if (!head->next) {
|
if (!head->next) {
|
||||||
@ -143,7 +143,7 @@ static void list_append(list_t *list, void *el) {
|
|||||||
|
|
||||||
/* remove an item from the list */
|
/* remove an item from the list */
|
||||||
|
|
||||||
static void list_remove(list_t *list, void *remove_me) {
|
static inline void list_remove(list_t *list, void *remove_me) {
|
||||||
|
|
||||||
LIST_FOREACH(list, void, {
|
LIST_FOREACH(list, void, {
|
||||||
|
|
||||||
@ -165,7 +165,7 @@ static void list_remove(list_t *list, void *remove_me) {
|
|||||||
|
|
||||||
/* Returns true if el is in list */
|
/* Returns true if el is in list */
|
||||||
|
|
||||||
static bool list_contains(list_t *list, void *contains_me) {
|
static inline bool list_contains(list_t *list, void *contains_me) {
|
||||||
|
|
||||||
LIST_FOREACH(list, void, {
|
LIST_FOREACH(list, void, {
|
||||||
|
|
||||||
|
|||||||
390
src/afl-common.c
390
src/afl-common.c
@ -30,6 +30,7 @@
|
|||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
#include "alloc-inl.h"
|
#include "alloc-inl.h"
|
||||||
#include "envs.h"
|
#include "envs.h"
|
||||||
|
#include "common.h"
|
||||||
|
|
||||||
/* Detect @@ in args. */
|
/* Detect @@ in args. */
|
||||||
#ifndef __glibc__
|
#ifndef __glibc__
|
||||||
@ -393,3 +394,392 @@ char *get_afl_env(char *env) {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
u64 get_cur_time(void) {
|
||||||
|
|
||||||
|
struct timeval tv;
|
||||||
|
struct timezone tz;
|
||||||
|
|
||||||
|
gettimeofday(&tv, &tz);
|
||||||
|
|
||||||
|
return (tv.tv_sec * 1000ULL) + (tv.tv_usec / 1000);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Get unix time in microseconds */
|
||||||
|
|
||||||
|
u64 get_cur_time_us(void) {
|
||||||
|
|
||||||
|
struct timeval tv;
|
||||||
|
struct timezone tz;
|
||||||
|
|
||||||
|
gettimeofday(&tv, &tz);
|
||||||
|
|
||||||
|
return (tv.tv_sec * 1000000ULL) + tv.tv_usec;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Describe integer. The buf should be
|
||||||
|
at least 6 bytes to fit all ints we randomly see.
|
||||||
|
Will return buf for convenience. */
|
||||||
|
|
||||||
|
u8 *stringify_int(u8 *buf, size_t len, u64 val) {
|
||||||
|
|
||||||
|
#define CHK_FORMAT(_divisor, _limit_mult, _fmt, _cast) \
|
||||||
|
do { \
|
||||||
|
\
|
||||||
|
if (val < (_divisor) * (_limit_mult)) { \
|
||||||
|
\
|
||||||
|
snprintf(buf, len, _fmt, ((_cast)val) / (_divisor)); \
|
||||||
|
return buf; \
|
||||||
|
\
|
||||||
|
} \
|
||||||
|
\
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
/* 0-9999 */
|
||||||
|
CHK_FORMAT(1, 10000, "%llu", u64);
|
||||||
|
|
||||||
|
/* 10.0k - 99.9k */
|
||||||
|
CHK_FORMAT(1000, 99.95, "%0.01fk", double);
|
||||||
|
|
||||||
|
/* 100k - 999k */
|
||||||
|
CHK_FORMAT(1000, 1000, "%lluk", u64);
|
||||||
|
|
||||||
|
/* 1.00M - 9.99M */
|
||||||
|
CHK_FORMAT(1000 * 1000, 9.995, "%0.02fM", double);
|
||||||
|
|
||||||
|
/* 10.0M - 99.9M */
|
||||||
|
CHK_FORMAT(1000 * 1000, 99.95, "%0.01fM", double);
|
||||||
|
|
||||||
|
/* 100M - 999M */
|
||||||
|
CHK_FORMAT(1000 * 1000, 1000, "%lluM", u64);
|
||||||
|
|
||||||
|
/* 1.00G - 9.99G */
|
||||||
|
CHK_FORMAT(1000LL * 1000 * 1000, 9.995, "%0.02fG", double);
|
||||||
|
|
||||||
|
/* 10.0G - 99.9G */
|
||||||
|
CHK_FORMAT(1000LL * 1000 * 1000, 99.95, "%0.01fG", double);
|
||||||
|
|
||||||
|
/* 100G - 999G */
|
||||||
|
CHK_FORMAT(1000LL * 1000 * 1000, 1000, "%lluG", u64);
|
||||||
|
|
||||||
|
/* 1.00T - 9.99G */
|
||||||
|
CHK_FORMAT(1000LL * 1000 * 1000 * 1000, 9.995, "%0.02fT", double);
|
||||||
|
|
||||||
|
/* 10.0T - 99.9T */
|
||||||
|
CHK_FORMAT(1000LL * 1000 * 1000 * 1000, 99.95, "%0.01fT", double);
|
||||||
|
|
||||||
|
/* 100T+ */
|
||||||
|
strncpy(buf, "infty", len);
|
||||||
|
buf[len - 1] = '\0';
|
||||||
|
|
||||||
|
return buf;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Describe float. Similar as int. */
|
||||||
|
|
||||||
|
u8 *stringify_float(u8 *buf, size_t len, double val) {
|
||||||
|
|
||||||
|
if (val < 99.995) {
|
||||||
|
|
||||||
|
snprintf(buf, len, "%0.02f", val);
|
||||||
|
|
||||||
|
} else if (val < 999.95) {
|
||||||
|
|
||||||
|
snprintf(buf, len, "%0.01f", val);
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
stringify_int(buf, len, (u64)val);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
return buf;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Describe integer as memory size. */
|
||||||
|
|
||||||
|
u8 *stringify_mem_size(u8 *buf, size_t len, u64 val) {
|
||||||
|
|
||||||
|
/* 0-9999 */
|
||||||
|
CHK_FORMAT(1, 10000, "%llu B", u64);
|
||||||
|
|
||||||
|
/* 10.0k - 99.9k */
|
||||||
|
CHK_FORMAT(1024, 99.95, "%0.01f kB", double);
|
||||||
|
|
||||||
|
/* 100k - 999k */
|
||||||
|
CHK_FORMAT(1024, 1000, "%llu kB", u64);
|
||||||
|
|
||||||
|
/* 1.00M - 9.99M */
|
||||||
|
CHK_FORMAT(1024 * 1024, 9.995, "%0.02f MB", double);
|
||||||
|
|
||||||
|
/* 10.0M - 99.9M */
|
||||||
|
CHK_FORMAT(1024 * 1024, 99.95, "%0.01f MB", double);
|
||||||
|
|
||||||
|
/* 100M - 999M */
|
||||||
|
CHK_FORMAT(1024 * 1024, 1000, "%llu MB", u64);
|
||||||
|
|
||||||
|
/* 1.00G - 9.99G */
|
||||||
|
CHK_FORMAT(1024LL * 1024 * 1024, 9.995, "%0.02f GB", double);
|
||||||
|
|
||||||
|
/* 10.0G - 99.9G */
|
||||||
|
CHK_FORMAT(1024LL * 1024 * 1024, 99.95, "%0.01f GB", double);
|
||||||
|
|
||||||
|
/* 100G - 999G */
|
||||||
|
CHK_FORMAT(1024LL * 1024 * 1024, 1000, "%llu GB", u64);
|
||||||
|
|
||||||
|
/* 1.00T - 9.99G */
|
||||||
|
CHK_FORMAT(1024LL * 1024 * 1024 * 1024, 9.995, "%0.02f TB", double);
|
||||||
|
|
||||||
|
/* 10.0T - 99.9T */
|
||||||
|
CHK_FORMAT(1024LL * 1024 * 1024 * 1024, 99.95, "%0.01f TB", double);
|
||||||
|
|
||||||
|
#undef CHK_FORMAT
|
||||||
|
|
||||||
|
/* 100T+ */
|
||||||
|
strncpy(buf, "infty", len - 1);
|
||||||
|
buf[len - 1] = '\0';
|
||||||
|
|
||||||
|
return buf;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Describe time delta as string.
|
||||||
|
Returns a pointer to buf for convenience. */
|
||||||
|
|
||||||
|
u8 *stringify_time_diff(u8 *buf, size_t len, u64 cur_ms, u64 event_ms) {
|
||||||
|
|
||||||
|
u64 delta;
|
||||||
|
s32 t_d, t_h, t_m, t_s;
|
||||||
|
u8 val_buf[STRINGIFY_VAL_SIZE_MAX];
|
||||||
|
|
||||||
|
if (!event_ms) {
|
||||||
|
|
||||||
|
snprintf(buf, len, "none seen yet");
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
delta = cur_ms - event_ms;
|
||||||
|
|
||||||
|
t_d = delta / 1000 / 60 / 60 / 24;
|
||||||
|
t_h = (delta / 1000 / 60 / 60) % 24;
|
||||||
|
t_m = (delta / 1000 / 60) % 60;
|
||||||
|
t_s = (delta / 1000) % 60;
|
||||||
|
|
||||||
|
stringify_int(val_buf, sizeof(val_buf), t_d);
|
||||||
|
snprintf(buf, len, "%s days, %d hrs, %d min, %d sec", val_buf, t_h, t_m,
|
||||||
|
t_s);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
return buf;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Unsafe Describe integer. The buf sizes are not checked.
|
||||||
|
This is unsafe but fast.
|
||||||
|
Will return buf for convenience. */
|
||||||
|
|
||||||
|
u8 *u_stringify_int(u8 *buf, u64 val) {
|
||||||
|
|
||||||
|
#define CHK_FORMAT(_divisor, _limit_mult, _fmt, _cast) \
|
||||||
|
do { \
|
||||||
|
\
|
||||||
|
if (val < (_divisor) * (_limit_mult)) { \
|
||||||
|
\
|
||||||
|
sprintf(buf, _fmt, ((_cast)val) / (_divisor)); \
|
||||||
|
return buf; \
|
||||||
|
\
|
||||||
|
} \
|
||||||
|
\
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
/* 0-9999 */
|
||||||
|
CHK_FORMAT(1, 10000, "%llu", u64);
|
||||||
|
|
||||||
|
/* 10.0k - 99.9k */
|
||||||
|
CHK_FORMAT(1000, 99.95, "%0.01fk", double);
|
||||||
|
|
||||||
|
/* 100k - 999k */
|
||||||
|
CHK_FORMAT(1000, 1000, "%lluk", u64);
|
||||||
|
|
||||||
|
/* 1.00M - 9.99M */
|
||||||
|
CHK_FORMAT(1000 * 1000, 9.995, "%0.02fM", double);
|
||||||
|
|
||||||
|
/* 10.0M - 99.9M */
|
||||||
|
CHK_FORMAT(1000 * 1000, 99.95, "%0.01fM", double);
|
||||||
|
|
||||||
|
/* 100M - 999M */
|
||||||
|
CHK_FORMAT(1000 * 1000, 1000, "%lluM", u64);
|
||||||
|
|
||||||
|
/* 1.00G - 9.99G */
|
||||||
|
CHK_FORMAT(1000LL * 1000 * 1000, 9.995, "%0.02fG", double);
|
||||||
|
|
||||||
|
/* 10.0G - 99.9G */
|
||||||
|
CHK_FORMAT(1000LL * 1000 * 1000, 99.95, "%0.01fG", double);
|
||||||
|
|
||||||
|
/* 100G - 999G */
|
||||||
|
CHK_FORMAT(1000LL * 1000 * 1000, 1000, "%lluG", u64);
|
||||||
|
|
||||||
|
/* 1.00T - 9.99G */
|
||||||
|
CHK_FORMAT(1000LL * 1000 * 1000 * 1000, 9.995, "%0.02fT", double);
|
||||||
|
|
||||||
|
/* 10.0T - 99.9T */
|
||||||
|
CHK_FORMAT(1000LL * 1000 * 1000 * 1000, 99.95, "%0.01fT", double);
|
||||||
|
|
||||||
|
/* 100T+ */
|
||||||
|
strcpy(buf, "infty");
|
||||||
|
|
||||||
|
return buf;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Unsafe describe float. Similar as unsafe int. */
|
||||||
|
|
||||||
|
u8 *u_stringify_float(u8 *buf, double val) {
|
||||||
|
|
||||||
|
if (val < 99.995) {
|
||||||
|
|
||||||
|
sprintf(buf, "%0.02f", val);
|
||||||
|
|
||||||
|
} else if (val < 999.95) {
|
||||||
|
|
||||||
|
sprintf(buf, "%0.01f", val);
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
return u_stringify_int(buf, (u64)val);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
return buf;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Unsafe describe integer as memory size. */
|
||||||
|
|
||||||
|
u8 *u_stringify_mem_size(u8 *buf, u64 val) {
|
||||||
|
|
||||||
|
/* 0-9999 */
|
||||||
|
CHK_FORMAT(1, 10000, "%llu B", u64);
|
||||||
|
|
||||||
|
/* 10.0k - 99.9k */
|
||||||
|
CHK_FORMAT(1024, 99.95, "%0.01f kB", double);
|
||||||
|
|
||||||
|
/* 100k - 999k */
|
||||||
|
CHK_FORMAT(1024, 1000, "%llu kB", u64);
|
||||||
|
|
||||||
|
/* 1.00M - 9.99M */
|
||||||
|
CHK_FORMAT(1024 * 1024, 9.995, "%0.02f MB", double);
|
||||||
|
|
||||||
|
/* 10.0M - 99.9M */
|
||||||
|
CHK_FORMAT(1024 * 1024, 99.95, "%0.01f MB", double);
|
||||||
|
|
||||||
|
/* 100M - 999M */
|
||||||
|
CHK_FORMAT(1024 * 1024, 1000, "%llu MB", u64);
|
||||||
|
|
||||||
|
/* 1.00G - 9.99G */
|
||||||
|
CHK_FORMAT(1024LL * 1024 * 1024, 9.995, "%0.02f GB", double);
|
||||||
|
|
||||||
|
/* 10.0G - 99.9G */
|
||||||
|
CHK_FORMAT(1024LL * 1024 * 1024, 99.95, "%0.01f GB", double);
|
||||||
|
|
||||||
|
/* 100G - 999G */
|
||||||
|
CHK_FORMAT(1024LL * 1024 * 1024, 1000, "%llu GB", u64);
|
||||||
|
|
||||||
|
/* 1.00T - 9.99G */
|
||||||
|
CHK_FORMAT(1024LL * 1024 * 1024 * 1024, 9.995, "%0.02f TB", double);
|
||||||
|
|
||||||
|
/* 10.0T - 99.9T */
|
||||||
|
CHK_FORMAT(1024LL * 1024 * 1024 * 1024, 99.95, "%0.01f TB", double);
|
||||||
|
|
||||||
|
#undef CHK_FORMAT
|
||||||
|
|
||||||
|
/* 100T+ */
|
||||||
|
strcpy(buf, "infty");
|
||||||
|
|
||||||
|
return buf;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Unsafe describe time delta as string.
|
||||||
|
Returns a pointer to buf for convenience. */
|
||||||
|
|
||||||
|
u8 *u_stringify_time_diff(u8 *buf, u64 cur_ms, u64 event_ms) {
|
||||||
|
|
||||||
|
u64 delta;
|
||||||
|
s32 t_d, t_h, t_m, t_s;
|
||||||
|
u8 val_buf[STRINGIFY_VAL_SIZE_MAX];
|
||||||
|
|
||||||
|
if (!event_ms) {
|
||||||
|
|
||||||
|
sprintf(buf, "none seen yet");
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
delta = cur_ms - event_ms;
|
||||||
|
|
||||||
|
t_d = delta / 1000 / 60 / 60 / 24;
|
||||||
|
t_h = (delta / 1000 / 60 / 60) % 24;
|
||||||
|
t_m = (delta / 1000 / 60) % 60;
|
||||||
|
t_s = (delta / 1000) % 60;
|
||||||
|
|
||||||
|
u_stringify_int(val_buf, t_d);
|
||||||
|
sprintf(buf, "%s days, %d hrs, %d min, %d sec", val_buf, t_h, t_m, t_s);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
return buf;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Wrapper for select() and read(), reading exactly len bytes.
|
||||||
|
Returns the time passed to read.
|
||||||
|
If the wait times out, returns timeout_ms + 1;
|
||||||
|
Returns 0 if an error occurred (fd closed, signal, ...); */
|
||||||
|
u32 read_timed(s32 fd, void *buf, size_t len, u32 timeout_ms) {
|
||||||
|
|
||||||
|
struct timeval timeout;
|
||||||
|
fd_set readfds;
|
||||||
|
FD_ZERO(&readfds);
|
||||||
|
FD_SET(fd, &readfds);
|
||||||
|
|
||||||
|
timeout.tv_sec = (timeout_ms / 1000);
|
||||||
|
timeout.tv_usec = (timeout_ms % 1000) * 1000;
|
||||||
|
|
||||||
|
size_t read_total = 0;
|
||||||
|
size_t len_read = 0;
|
||||||
|
|
||||||
|
while (len_read < len) {
|
||||||
|
|
||||||
|
/* set exceptfds as well to return when a child exited/closed the pipe. */
|
||||||
|
int sret = select(fd + 1, &readfds, NULL, NULL, &timeout);
|
||||||
|
|
||||||
|
if (!sret) {
|
||||||
|
|
||||||
|
// printf("Timeout in sret.");
|
||||||
|
return timeout_ms + 1;
|
||||||
|
|
||||||
|
} else if (sret < 0) {
|
||||||
|
|
||||||
|
// perror("sret malloc");
|
||||||
|
// TODO: catch other (errno == EINTR) than ctrl+c?
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
len_read = read(fd, ((u8 *)buf) + len_read, len - len_read);
|
||||||
|
if (!len_read) { return 0; }
|
||||||
|
read_total += len_read;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
s32 exec_ms =
|
||||||
|
MIN(timeout_ms,
|
||||||
|
((u64)timeout_ms - (timeout.tv_sec * 1000 + timeout.tv_usec / 1000)));
|
||||||
|
return exec_ms > 0 ? exec_ms
|
||||||
|
: 1; // at least 1 milli must have passed (0 is an error)
|
||||||
|
|
||||||
|
}
|
||||||
|
|||||||
@ -224,26 +224,6 @@ static u32 write_results(afl_forkserver_t *fsrv) {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Write output file. */
|
|
||||||
|
|
||||||
static s32 write_to_file(u8 *path, u8 *mem, u32 len) {
|
|
||||||
|
|
||||||
s32 ret;
|
|
||||||
|
|
||||||
unlink(path); /* Ignore errors */
|
|
||||||
|
|
||||||
ret = open(path, O_RDWR | O_CREAT | O_EXCL, 0600);
|
|
||||||
|
|
||||||
if (ret < 0) PFATAL("Unable to create '%s'", path);
|
|
||||||
|
|
||||||
ck_write(ret, mem, len, path);
|
|
||||||
|
|
||||||
lseek(ret, 0, SEEK_SET);
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Write modified data to file for testing. If use_stdin is clear, the old file
|
/* Write modified data to file for testing. If use_stdin is clear, the old file
|
||||||
is unlinked and a new one is created. Otherwise, out_fd is rewound and
|
is unlinked and a new one is created. Otherwise, out_fd is rewound and
|
||||||
truncated. */
|
truncated. */
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user