Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Skip fuzz inputs that have more than 64 chunks

Browse source
This commit is contained in:
Justin Azoff 2020-05-20 09:44:06 -04:00
parent fda8b98ac7
commit 1e4374bd27
4 changed files with 28 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/fuzzers/FuzzBuffer.cc
View file

@ -17,6 +17,23 @@ bool zeek::detail::FuzzBuffer::Valid() const
return true;
}
int zeek::detail::FuzzBuffer::ChunkCount() const
{
auto pos = begin;
int chunks = 0;
while (pos < end)
{
pos = (const unsigned char*)memmem(pos, end - pos,
PKT_MAGIC, PKT_MAGIC_LEN);
if ( ! pos )
break;
pos += PKT_MAGIC_LEN + 1;
chunks++;
}
return chunks;
}
std::optional<zeek::detail::FuzzBuffer::Chunk> zeek::detail::FuzzBuffer::Next()
{
if ( begin == end )

5
src/fuzzers/FuzzBuffer.h
View file

@ -43,6 +43,11 @@ public:
*/
bool Valid() const;
/**
* @return the number of chunks in the fuzz buffer object
*/
int ChunkCount() const;
/**
* @return the next chunk to deliver, if one could be extracted
*/

3
src/fuzzers/packet-fuzzer.cc
View file

@ -18,6 +18,9 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
if ( ! fb.Valid() )
return 0;
if ( fb.ChunkCount() > 64 )
return 0;
for ( ; ; )
{
auto chunk = fb.Next();

3
src/fuzzers/pop3-fuzzer.cc
View file

@ -50,6 +50,9 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
if ( ! fb.Valid() )
return 0;
if ( fb.ChunkCount() > 64 )
return 0;
auto conn = add_connection();
auto a = add_analyzer(conn);