increase initial memory sized

This commit is contained in:
van Hauser
2020-08-15 13:34:51 +02:00
parent 1cf4738487
commit 0a251f93e0
4 changed files with 11 additions and 14 deletions

View File

@ -12,6 +12,8 @@ sending a mail to <afl-users+subscribe@googlegroups.com>.
### Version ++2.66d (devel) ### Version ++2.66d (devel)
- Support for improved afl++ snapshot module: - Support for improved afl++ snapshot module:
https://github.com/AFLplusplus/AFL-Snapshot-LKM https://github.com/AFLplusplus/AFL-Snapshot-LKM
- Due to the instrumentation needing more memory, the initial memory sizes
for -m have been increased
- afl-fuzz: - afl-fuzz:
- added -F option to allow -M main fuzzers to sync to foreign fuzzers, - added -F option to allow -M main fuzzers to sync to foreign fuzzers,
e.g. honggfuzz or libfuzzer e.g. honggfuzz or libfuzzer

View File

@ -109,7 +109,6 @@ If 1, close stdout at startup. If 2 close stderr; if 3 close both.
int __afl_sharedmem_fuzzing = 1; int __afl_sharedmem_fuzzing = 1;
extern unsigned int * __afl_fuzz_len; extern unsigned int * __afl_fuzz_len;
extern unsigned char *__afl_fuzz_ptr; extern unsigned char *__afl_fuzz_ptr;
// extern struct cmp_map *__afl_cmp_map;
// libFuzzer interface is thin, so we don't include any libFuzzer headers. // libFuzzer interface is thin, so we don't include any libFuzzer headers.
int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size); int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size);

View File

@ -70,21 +70,21 @@
#ifndef __NetBSD__ #ifndef __NetBSD__
#ifndef WORD_SIZE_64 #ifndef WORD_SIZE_64
#define MEM_LIMIT 25
#else
#define MEM_LIMIT 50 #define MEM_LIMIT 50
#else
#define MEM_LIMIT 75
#endif /* ^!WORD_SIZE_64 */ #endif /* ^!WORD_SIZE_64 */
#else /* NetBSD's kernel needs more space for stack, see discussion for issue \ #else /* NetBSD's kernel needs more space for stack, see discussion for issue \
#165 */ #165 */
#define MEM_LIMIT 200 #define MEM_LIMIT 250
#endif #endif
/* Default memory limit when running in QEMU mode (MB): */ /* Default memory limit when running in QEMU mode (MB): */
#define MEM_LIMIT_QEMU 200 #define MEM_LIMIT_QEMU 250
/* Default memory limit when running in Unicorn mode (MB): */ /* Default memory limit when running in Unicorn mode (MB): */
#define MEM_LIMIT_UNICORN 200 #define MEM_LIMIT_UNICORN 250
/* Number of calibration cycles per every new test case (and for test /* Number of calibration cycles per every new test case (and for test
cases that show variable behavior): */ cases that show variable behavior): */

View File

@ -902,15 +902,11 @@ __attribute__((constructor(0))) void __afl_auto_first(void) {
if (getenv("AFL_DISABLE_LLVM_INSTRUMENTATION")) return; if (getenv("AFL_DISABLE_LLVM_INSTRUMENTATION")) return;
u8 *ptr; u8 *ptr;
u32 get_size = __afl_final_loc ? __afl_final_loc : 1024000;
if (__afl_final_loc > MAP_INITIAL_SIZE) { ptr = (u8 *)mmap(NULL, __afl_final_loc, PROT_READ | PROT_WRITE, MAP_PRIVATE,
-1, 0);
ptr = (u8 *)mmap(NULL, __afl_final_loc, PROT_READ | PROT_WRITE, MAP_PRIVATE, if (ptr && (ssize_t)ptr != -1) { __afl_area_ptr = ptr; }
-1, 0);
if (ptr && (ssize_t)ptr != -1) { __afl_area_ptr = ptr; }
}
} }