ExternalVendorCode/AFLplusplus
1
0
Fork 0
mirror of https://github.com/AFLplusplus/AFLplusplus.git synced 2025-06-15 19:38:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
vanhauser-thc
2021-12-02 10:41:24 +01:00
parent 80d5afa373
commit ca7144161f
4 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -275,6 +275,8 @@ static void __afl_map_shm(void) {
char *id_str = getenv(SHM_ENV_VAR); char *id_str = getenv(SHM_ENV_VAR);
if (__afl_final_loc) { ++__afl_final_loc; } // as we count starting 0
if (__afl_final_loc) { if (__afl_final_loc) {
__afl_map_size = __afl_final_loc; __afl_map_size = __afl_final_loc;

16
src/afl-fuzz-bitmap.c
View File

@ -58,7 +58,7 @@ void write_bitmap(afl_state_t *afl) {
u32 count_bits(afl_state_t *afl, u8 *mem) { u32 count_bits(afl_state_t *afl, u8 *mem) {
u32 *ptr = (u32 *)mem; u32 *ptr = (u32 *)mem;
u32 i = (afl->fsrv.map_size >> 2); u32 i = ((afl->fsrv.real_map_size + 3) >> 2);
u32 ret = 0; u32 ret = 0;
while (i--) { while (i--) {
@ -68,7 +68,7 @@ u32 count_bits(afl_state_t *afl, u8 *mem) {
/* This gets called on the inverse, virgin bitmap; optimize for sparse /* This gets called on the inverse, virgin bitmap; optimize for sparse
data. */ data. */
if (v == 0xffffffff) { if (likely(v == 0xffffffff)) {
ret += 32; ret += 32;
continue; continue;
@ -92,14 +92,14 @@ u32 count_bits(afl_state_t *afl, u8 *mem) {
u32 count_bytes(afl_state_t *afl, u8 *mem) { u32 count_bytes(afl_state_t *afl, u8 *mem) {
u32 *ptr = (u32 *)mem; u32 *ptr = (u32 *)mem;
u32 i = (afl->fsrv.map_size >> 2); u32 i = ((afl->fsrv.real_map_size + 3) >> 2);
u32 ret = 0; u32 ret = 0;
while (i--) { while (i--) {
u32 v = *(ptr++); u32 v = *(ptr++);
if (!v) { continue; } if (likely(!v)) { continue; }
if (v & 0x000000ffU) { ++ret; } if (v & 0x000000ffU) { ++ret; }
if (v & 0x0000ff00U) { ++ret; } if (v & 0x0000ff00U) { ++ret; }
if (v & 0x00ff0000U) { ++ret; } if (v & 0x00ff0000U) { ++ret; }
@ -117,7 +117,7 @@ u32 count_bytes(afl_state_t *afl, u8 *mem) {
u32 count_non_255_bytes(afl_state_t *afl, u8 *mem) { u32 count_non_255_bytes(afl_state_t *afl, u8 *mem) {
u32 *ptr = (u32 *)mem; u32 *ptr = (u32 *)mem;
u32 i = (afl->fsrv.map_size >> 2); u32 i = ((afl->fsrv.real_map_size + 3) >> 2);
u32 ret = 0; u32 ret = 0;
while (i--) { while (i--) {
@ -127,7 +127,7 @@ u32 count_non_255_bytes(afl_state_t *afl, u8 *mem) {
/* This is called on the virgin bitmap, so optimize for the most likely /* This is called on the virgin bitmap, so optimize for the most likely
case. */ case. */
if (v == 0xffffffffU) { continue; } if (likely(v == 0xffffffffU)) { continue; }
if ((v & 0x000000ffU) != 0x000000ffU) { ++ret; } if ((v & 0x000000ffU) != 0x000000ffU) { ++ret; }
if ((v & 0x0000ff00U) != 0x0000ff00U) { ++ret; } if ((v & 0x0000ff00U) != 0x0000ff00U) { ++ret; }
if ((v & 0x00ff0000U) != 0x00ff0000U) { ++ret; } if ((v & 0x00ff0000U) != 0x00ff0000U) { ++ret; }
@ -216,14 +216,14 @@ inline u8 has_new_bits(afl_state_t *afl, u8 *virgin_map) {
u64 *current = (u64 *)afl->fsrv.trace_bits; u64 *current = (u64 *)afl->fsrv.trace_bits;
u64 *virgin = (u64 *)virgin_map; u64 *virgin = (u64 *)virgin_map;
u32 i = (afl->fsrv.map_size >> 3); u32 i = ((afl->fsrv.real_map_size + 7) >> 3);
#else #else
u32 *current = (u32 *)afl->fsrv.trace_bits; u32 *current = (u32 *)afl->fsrv.trace_bits;
u32 *virgin = (u32 *)virgin_map; u32 *virgin = (u32 *)virgin_map;
u32 i = (afl->fsrv.map_size >> 2); u32 i = ((afl->fsrv.real_map_size + 3) >> 2);
#endif /* ^WORD_SIZE_64 */ #endif /* ^WORD_SIZE_64 */

6
src/afl-fuzz-stats.c
View File

@ -543,9 +543,11 @@ void show_stats(afl_state_t *afl) {
FATAL( FATAL(
"Incorrect fuzzing setup detected. Your target seems to have loaded " "Incorrect fuzzing setup detected. Your target seems to have loaded "
"incorrectly instrumented shared libraries. If you use LTO mode " "incorrectly instrumented shared libraries (%u of %u/%u). If you use "
"LTO mode "
"please see instrumentation/README.lto.md. To ignore this problem " "please see instrumentation/README.lto.md. To ignore this problem "
"and continue fuzzing just set 'AFL_IGNORE_PROBLEMS=1'.\n"); "and continue fuzzing just set 'AFL_IGNORE_PROBLEMS=1'.\n",
t_bytes, afl->fsrv.real_map_size, afl->fsrv.map_size);
} }

6
src/afl-showmap.c
View File

@ -1435,9 +1435,9 @@ int main(int argc, char **argv_orig, char **envp) {
if (!quiet_mode || collect_coverage) { if (!quiet_mode || collect_coverage) {
if (!tcnt && !have_coverage) { FATAL("No instrumentation detected" cRST); } if (!tcnt && !have_coverage) { FATAL("No instrumentation detected" cRST); }
OKF("Captured %u tuples (highest value %u, total values %llu) in " OKF("Captured %u tuples (map size %u, highest value %u, total values %llu) "
"'%s'." cRST, "in '%s'." cRST,
tcnt, highest, total, out_file); tcnt, fsrv->real_map_size, highest, total, out_file);
if (collect_coverage) if (collect_coverage)
OKF("A coverage of %u edges were achieved out of %u existing (%.02f%%) " OKF("A coverage of %u edges were achieved out of %u existing (%.02f%%) "
"with %llu input files.", "with %llu input files.",