fuzz: fix memory allocation failure logic (#1867)

We *do* want to have some allocation errors.
Fix some related bugs
Fix: 29be01ef
This commit is contained in:
Ivan Nardi
2023-01-20 14:27:33 +01:00
committed by GitHub
parent 496b284c98
commit 5e8c1ebbb7
280 changed files with 161 additions and 124 deletions
+15 -14
View File
@@ -2,8 +2,6 @@
#include "fuzz_common_code.h"
#ifdef ENABLE_MEM_ALLOC_FAILURES
static int mem_alloc_state = 0;
__attribute__((no_sanitize("integer")))
@@ -14,18 +12,27 @@ static int fastrand ()
return (mem_alloc_state >> 16) & 0x7FFF;
}
void *malloc_wrapper(size_t size) {
static void *malloc_wrapper(size_t size) {
return (fastrand () % 16) ? malloc (size) : NULL;
}
void free_wrapper(void *freeable) {
static void free_wrapper(void *freeable) {
free(freeable);
}
void set_mem_alloc_state(int value) {
mem_alloc_state = value;
void fuzz_set_alloc_callbacks(void)
{
set_ndpi_malloc(malloc_wrapper);
set_ndpi_free(free_wrapper);
}
void fuzz_set_alloc_seed(int seed)
{
mem_alloc_state = seed;
}
void fuzz_set_alloc_callbacks_and_seed(int seed)
{
fuzz_set_alloc_callbacks();
fuzz_set_alloc_seed(seed);
}
#endif
void fuzz_init_detection_module(struct ndpi_detection_module_struct **ndpi_info_mod,
int enable_log)
@@ -34,10 +41,6 @@ void fuzz_init_detection_module(struct ndpi_detection_module_struct **ndpi_info_
NDPI_PROTOCOL_BITMASK all, debug_bitmask;
if(*ndpi_info_mod == NULL) {
#ifdef ENABLE_MEM_ALLOC_FAILURES
set_ndpi_malloc(malloc_wrapper);
set_ndpi_free(free_wrapper);
#endif
*ndpi_info_mod = ndpi_init_detection_module(prefs);
NDPI_BITMASK_SET_ALL(all);
ndpi_set_protocol_detection_bitmask2(*ndpi_info_mod, &all);
@@ -57,5 +60,3 @@ void fuzz_init_detection_module(struct ndpi_detection_module_struct **ndpi_info_
ndpi_finalize_initialization(*ndpi_info_mod);
}
}