aboutsummaryrefslogtreecommitdiff
path: root/fuzz/fuzz_ds_patricia.cpp
diff options
context:
space:
mode:
authorIvan Nardi <12729895+IvanNardi@users.noreply.github.com>2023-02-09 20:02:12 +0100
committerGitHub <noreply@github.com>2023-02-09 20:02:12 +0100
commitb51a2ac72a3cbd1b470890d0151a46da28e6754e (patch)
tree694a86ec7690962b21fb2c1bcf12df9f842d5957 /fuzz/fuzz_ds_patricia.cpp
parent4bb851384efb2a321def0bdb5e93786fac1cc02b (diff)
fuzz: some improvements and add two new fuzzers (#1881)
Remove `FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION` define from `fuzz/Makefile.am`; it is already included by the main configure script (when fuzzing). Add a knob to force disabling of AESNI optimizations: this way we can fuzz also no-aesni crypto code. Move CRC32 algorithm into the library. Add some fake traces to extend fuzzing coverage. Note that these traces are hand-made (via scapy/curl) and must not be used as "proof" that the dissectors are really able to identify this kind of traffic. Some small updates to some dissectors: CSGO: remove a wrong rule (never triggered, BTW). Any UDP packet starting with "VS01" will be classified as STEAM (see steam.c around line 111). Googling it, it seems right so. XBOX: XBOX only analyses UDP flows while HTTP only TCP ones; therefore that condition is false. RTP, STUN: removed useless "break"s Zattoo: `flow->zattoo_stage` is never set to any values greater or equal to 5, so these checks are never true. PPStream: `flow->l4.udp.ppstream_stage` is never read. Delete it. TeamSpeak: we check for `flow->packet_counter == 3` just above, so the following check `flow->packet_counter >= 3` is always false.
Diffstat (limited to 'fuzz/fuzz_ds_patricia.cpp')
-rw-r--r--fuzz/fuzz_ds_patricia.cpp38
1 files changed, 23 insertions, 15 deletions
diff --git a/fuzz/fuzz_ds_patricia.cpp b/fuzz/fuzz_ds_patricia.cpp
index 4655ee94f..e6ec36010 100644
--- a/fuzz/fuzz_ds_patricia.cpp
+++ b/fuzz/fuzz_ds_patricia.cpp
@@ -6,20 +6,13 @@
#include <assert.h>
#include "fuzzer/FuzzedDataProvider.h"
-static void free_ptree_data(void *data) {
- /* Nothing to do */
- assert(data);
-}
static void process_ptree_data(ndpi_prefix_t *prefix, void *data) {
/* Nothing to do */
- assert(prefix);
- assert(data == NULL);
+ assert(prefix && data == NULL);
}
static void process3_ptree_data(ndpi_patricia_node_t *node, void *data, void *user_data) {
/* Nothing to do */
- assert(node);
- assert(data == NULL);
- assert(user_data == NULL);
+ assert(node && data == NULL && user_data == NULL);
}
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
@@ -47,6 +40,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
p = ndpi_patricia_new(maxbits);
+ ndpi_patricia_get_maxbits(p);
ndpi_patricia_process(p, process_ptree_data);
ndpi_patricia_walk_tree_inorder(p, process3_ptree_data, NULL);
@@ -64,11 +58,18 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
if (node && is_added == 0 && fuzzed_data.ConsumeBool()) {
is_added = 1;
prefix_added = prefix;
+ /* Some random operations on this node */
+ ndpi_patricia_get_node_prefix(node);
+ ndpi_patricia_get_node_bits(node);
+ ndpi_patricia_set_node_data(node, NULL);
+ assert(ndpi_patricia_get_node_data(node) == NULL);
+ ndpi_patricia_set_node_u64(node, 0);
+ assert(ndpi_patricia_get_node_u64(node) == 0);
}
}
} else {
- if(fuzzed_data.remaining_bytes() > 128) {
- std::vector<u_int8_t>data = fuzzed_data.ConsumeBytes<u_int8_t>(128);
+ if(fuzzed_data.remaining_bytes() > 16) {
+ std::vector<u_int8_t>data = fuzzed_data.ConsumeBytes<u_int8_t>(16);
ip = data.data();
ip_len = fuzzed_data.ConsumeIntegralInRange(0, 128);
ndpi_fill_prefix_v6(&prefix, (const struct in6_addr *)ip, ip_len, 128);
@@ -77,6 +78,13 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
if (node && is_added == 0 && fuzzed_data.ConsumeBool()) {
is_added = 1;
prefix_added = prefix;
+ /* Some random operations on this node */
+ ndpi_patricia_get_node_prefix(node);
+ ndpi_patricia_get_node_bits(node);
+ ndpi_patricia_set_node_data(node, NULL);
+ assert(ndpi_patricia_get_node_data(node) == NULL);
+ ndpi_patricia_set_node_u64(node, 0);
+ assert(ndpi_patricia_get_node_u64(node) == 0);
}
}
}
@@ -99,8 +107,8 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
ndpi_patricia_remove(p, node);
}
} else {
- if(fuzzed_data.remaining_bytes() > 128) {
- std::vector<u_int8_t>data = fuzzed_data.ConsumeBytes<u_int8_t>(128);
+ if(fuzzed_data.remaining_bytes() > 16) {
+ std::vector<u_int8_t>data = fuzzed_data.ConsumeBytes<u_int8_t>(16);
ip = data.data();
ip_len = fuzzed_data.ConsumeIntegralInRange(0, 128);
ndpi_fill_prefix_v6(&prefix, (const struct in6_addr *)ip, ip_len, 128);
@@ -149,8 +157,8 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
ndpi_patricia_walk_tree_inorder(p_cloned, process3_ptree_data, NULL);
- ndpi_patricia_destroy(p, free_ptree_data);
- ndpi_patricia_destroy(p_cloned, free_ptree_data);
+ ndpi_patricia_destroy(p, NULL);
+ ndpi_patricia_destroy(p_cloned, NULL);
return 0;
}