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

remove unnecessary map_size variables

Browse Source
This commit is contained in:
van Hauser
2020-04-17 11:39:38 +02:00
parent 6bd49b1d5c
commit 1931838a11
6 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/afl-fuzz.h
View File

@ -325,8 +325,6 @@ typedef struct afl_env_vars {
*afl_python_module, *afl_path, *afl_hang_tmout, *afl_skip_crashes, *afl_python_module, *afl_path, *afl_hang_tmout, *afl_skip_crashes,
*afl_preload; *afl_preload;
uint32_t map_size;
} afl_env_vars_t; } afl_env_vars_t;
struct afl_pass_stat { struct afl_pass_stat {

3
include/sharedmem.h
View File

@ -44,8 +44,7 @@ typedef struct sharedmem {
u8 *map; /* shared memory region */ u8 *map; /* shared memory region */
size_t size_alloc; /* actual allocated size */ size_t map_size; /* actual allocated size */
size_t size_used; /* in use by shmem app */
int cmplog_mode; int cmplog_mode;
struct cmp_map *cmp_map; struct cmp_map *cmp_map;

22
llvm_mode/afl-clang-fast.c
View File

@ -223,18 +223,20 @@ static void edit_params(u32 argc, char **argv, char **envp) {
} }
if ((!(getenv("AFL_LLVM_LTO_AUTODICTIONARY") // disabled when autodictionary if (getenv("LAF_TRANSFORM_COMPARES") ||
&& instrument_mode != INSTRUMENT_LTO)) // and lto_mode is used getenv("AFL_LLVM_LAF_TRANSFORM_COMPARES"))) {
&& (getenv("LAF_TRANSFORM_COMPARES") ||
getenv("AFL_LLVM_LAF_TRANSFORM_COMPARES"))) {
cc_params[cc_par_cnt++] = "-Xclang"; if (!be_quiet && getenv("AFL_LLVM_LTO_AUTODICTIONARY") &&
cc_params[cc_par_cnt++] = "-load"; instrument_mode != INSTRUMENT_LTO))
cc_params[cc_par_cnt++] = "-Xclang"; WARNF("using AFL_LLVM_LAF_TRANSFORM_COMPARES together with AFL_LLVM_LTO_AUTODICTIONARY makes no sense. Use only AFL_LLVM_LTO_AUTODICTIONARY.");
cc_params[cc_par_cnt++] =
alloc_printf("%s/compare-transform-pass.so", obj_path);
} cc_params[cc_par_cnt++] = "-Xclang";
cc_params[cc_par_cnt++] = "-load";
cc_params[cc_par_cnt++] = "-Xclang";
cc_params[cc_par_cnt++] =
alloc_printf("%s/compare-transform-pass.so", obj_path);
}
if (getenv("LAF_SPLIT_COMPARES") || getenv("AFL_LLVM_LAF_SPLIT_COMPARES")) { if (getenv("LAF_SPLIT_COMPARES") || getenv("AFL_LLVM_LAF_SPLIT_COMPARES")) {

2
src/afl-fuzz-state.c
View File

@ -81,7 +81,7 @@ void afl_state_init(afl_state_t *afl, uint32_t map_size) {
and out_size are NULL/0 by default. */ and out_size are NULL/0 by default. */
memset(afl, 0, sizeof(afl_state_t)); memset(afl, 0, sizeof(afl_state_t));
if (!map_size) map_size = MAP_SIZE; if (!map_size) afl->shm.map_size = MAP_SIZE;
afl->w_init = 0.9; afl->w_init = 0.9;
afl->w_end = 0.3; afl->w_end = 0.3;

2
src/afl-fuzz.c
View File

@ -264,7 +264,7 @@ int main(int argc, char **argv_orig, char **envp) {
afl_fsrv_init(&afl->fsrv); afl_fsrv_init(&afl->fsrv);
read_afl_environment(afl, envp); read_afl_environment(afl, envp);
if (afl->afl_env.map_size) afl->fsrv.map_size = afl->afl_env.map_size; if (afl->shm.map_size) afl->fsrv.map_size = afl->shm.map_size;
exit_1 = !!afl->afl_env.afl_bench_just_one; exit_1 = !!afl->afl_env.afl_bench_just_one;
SAYF(cCYA "afl-fuzz" VERSION cRST SAYF(cCYA "afl-fuzz" VERSION cRST

4
src/afl-sharedmem.c
View File

@ -72,7 +72,7 @@ void afl_shm_deinit(sharedmem_t *shm) {
#ifdef USEMMAP #ifdef USEMMAP
if (shm->map != NULL) { if (shm->map != NULL) {
munmap(shm->map, shm->size_alloc); munmap(shm->map, shm->map_size);
shm->map = NULL; shm->map = NULL;
} }
@ -99,7 +99,7 @@ void afl_shm_deinit(sharedmem_t *shm) {
u8 *afl_shm_init(sharedmem_t *shm, size_t map_size, unsigned char dumb_mode) { u8 *afl_shm_init(sharedmem_t *shm, size_t map_size, unsigned char dumb_mode) {
shm->size_alloc = shm->size_used = map_size; shm->map_size = map_size;
shm->map = NULL; shm->map = NULL;