Skip to content

Commit 5236b2e

Browse files
author
MarcoFalke
committed
Merge #18417: tests: Add fuzzing harnesses for functions in addrdb.h, net_permissions.h and timedata.h
4308aa6 tests: Add fuzzing harness for functions in net_permissions.h (practicalswift) 43ff0d9 tests: Add fuzzing harness for functions in timedata.h (practicalswift) a8695db tests: Add fuzzing harness for functions in addrdb.h (practicalswift) Pull request description: Add fuzzing harnesses for functions in `addrdb.h`, `net_permissions.h` and `timedata.h`. Top commit has no ACKs. Tree-SHA512: ea41431e7f1944ecd0c102e6ea04e70d6763dc9b6e3a0949a4f7299897a92fa3e8e7139f9f65b9508ce8d45613ea24ec0fd6d4a8be3cfd7c23136512b17770eb
2 parents 98fbb2a + 4308aa6 commit 5236b2e

File tree

4 files changed

+144
-0
lines changed

4 files changed

+144
-0
lines changed

‎src/Makefile.test.include

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
FUZZ_TARGETS = \
66
test/fuzz/addr_info_deserialize \
7+
test/fuzz/addrdb \
78
test/fuzz/address_deserialize \
89
test/fuzz/addrman_deserialize \
910
test/fuzz/asmap \
@@ -43,6 +44,7 @@ FUZZ_TARGETS = \
4344
test/fuzz/merkle_block_deserialize \
4445
test/fuzz/messageheader_deserialize \
4546
test/fuzz/multiplication_overflow \
47+
test/fuzz/net_permissions \
4648
test/fuzz/netaddr_deserialize \
4749
test/fuzz/netaddress \
4850
test/fuzz/out_point_deserialize \
@@ -97,6 +99,7 @@ FUZZ_TARGETS = \
9799
test/fuzz/string \
98100
test/fuzz/strprintf \
99101
test/fuzz/sub_net_deserialize \
102+
test/fuzz/timedata \
100103
test/fuzz/transaction \
101104
test/fuzz/tx_in \
102105
test/fuzz/tx_in_deserialize \
@@ -288,6 +291,12 @@ test_fuzz_addr_info_deserialize_LDADD = $(FUZZ_SUITE_LD_COMMON)
288291
test_fuzz_addr_info_deserialize_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
289292
test_fuzz_addr_info_deserialize_SOURCES = $(FUZZ_SUITE) test/fuzz/deserialize.cpp
290293

294+
test_fuzz_addrdb_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
295+
test_fuzz_addrdb_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
296+
test_fuzz_addrdb_LDADD = $(FUZZ_SUITE_LD_COMMON)
297+
test_fuzz_addrdb_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
298+
test_fuzz_addrdb_SOURCES = $(FUZZ_SUITE) test/fuzz/addrdb.cpp
299+
291300
test_fuzz_address_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -DADDRESS_DESERIALIZE=1
292301
test_fuzz_address_deserialize_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
293302
test_fuzz_address_deserialize_LDADD = $(FUZZ_SUITE_LD_COMMON)
@@ -522,6 +531,12 @@ test_fuzz_multiplication_overflow_LDADD = $(FUZZ_SUITE_LD_COMMON)
522531
test_fuzz_multiplication_overflow_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
523532
test_fuzz_multiplication_overflow_SOURCES = $(FUZZ_SUITE) test/fuzz/multiplication_overflow.cpp
524533

534+
test_fuzz_net_permissions_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
535+
test_fuzz_net_permissions_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
536+
test_fuzz_net_permissions_LDADD = $(FUZZ_SUITE_LD_COMMON)
537+
test_fuzz_net_permissions_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
538+
test_fuzz_net_permissions_SOURCES = $(FUZZ_SUITE) test/fuzz/net_permissions.cpp
539+
525540
test_fuzz_netaddr_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -DNETADDR_DESERIALIZE=1
526541
test_fuzz_netaddr_deserialize_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
527542
test_fuzz_netaddr_deserialize_LDADD = $(FUZZ_SUITE_LD_COMMON)
@@ -846,6 +861,12 @@ test_fuzz_sub_net_deserialize_LDADD = $(FUZZ_SUITE_LD_COMMON)
846861
test_fuzz_sub_net_deserialize_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
847862
test_fuzz_sub_net_deserialize_SOURCES = $(FUZZ_SUITE) test/fuzz/deserialize.cpp
848863

864+
test_fuzz_timedata_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
865+
test_fuzz_timedata_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
866+
test_fuzz_timedata_LDADD = $(FUZZ_SUITE_LD_COMMON)
867+
test_fuzz_timedata_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
868+
test_fuzz_timedata_SOURCES = $(FUZZ_SUITE) test/fuzz/timedata.cpp
869+
849870
test_fuzz_transaction_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
850871
test_fuzz_transaction_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
851872
test_fuzz_transaction_LDADD = $(FUZZ_SUITE_LD_COMMON)

‎src/test/fuzz/addrdb.cpp

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
// Copyright (c) 2020 The Bitcoin Core developers
2+
// Distributed under the MIT software license, see the accompanying
3+
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
4+
5+
#include <addrdb.h>
6+
#include <optional.h>
7+
#include <test/fuzz/FuzzedDataProvider.h>
8+
#include <test/fuzz/fuzz.h>
9+
#include <test/fuzz/util.h>
10+
11+
#include <cassert>
12+
#include <cstdint>
13+
#include <string>
14+
#include <vector>
15+
16+
void test_one_input(const std::vector<uint8_t>& buffer)
17+
{
18+
FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
19+
20+
const CBanEntry ban_entry = [&] {
21+
switch (fuzzed_data_provider.ConsumeIntegralInRange<int>(0, 3)) {
22+
case 0:
23+
return CBanEntry{fuzzed_data_provider.ConsumeIntegral<int64_t>()};
24+
break;
25+
case 1:
26+
return CBanEntry{fuzzed_data_provider.ConsumeIntegral<int64_t>(), fuzzed_data_provider.PickValueInArray<BanReason>({
27+
BanReason::BanReasonUnknown,
28+
BanReason::BanReasonNodeMisbehaving,
29+
BanReason::BanReasonManuallyAdded,
30+
})};
31+
break;
32+
case 2: {
33+
const Optional<CBanEntry> ban_entry = ConsumeDeserializable<CBanEntry>(fuzzed_data_provider);
34+
if (ban_entry) {
35+
return *ban_entry;
36+
}
37+
break;
38+
}
39+
}
40+
return CBanEntry{};
41+
}();
42+
assert(!ban_entry.banReasonToString().empty());
43+
}

‎src/test/fuzz/net_permissions.cpp

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
// Copyright (c) 2020 The Bitcoin Core developers
2+
// Distributed under the MIT software license, see the accompanying
3+
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
4+
5+
#include <net_permissions.h>
6+
#include <optional.h>
7+
#include <test/fuzz/FuzzedDataProvider.h>
8+
#include <test/fuzz/fuzz.h>
9+
#include <test/fuzz/util.h>
10+
11+
#include <cassert>
12+
#include <cstdint>
13+
#include <string>
14+
#include <vector>
15+
16+
void test_one_input(const std::vector<uint8_t>& buffer)
17+
{
18+
FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
19+
const std::string s = fuzzed_data_provider.ConsumeRandomLengthString(32);
20+
const NetPermissionFlags net_permission_flags = fuzzed_data_provider.ConsumeBool() ? fuzzed_data_provider.PickValueInArray<NetPermissionFlags>({
21+
NetPermissionFlags::PF_NONE,
22+
NetPermissionFlags::PF_BLOOMFILTER,
23+
NetPermissionFlags::PF_RELAY,
24+
NetPermissionFlags::PF_FORCERELAY,
25+
NetPermissionFlags::PF_NOBAN,
26+
NetPermissionFlags::PF_MEMPOOL,
27+
NetPermissionFlags::PF_ISIMPLICIT,
28+
NetPermissionFlags::PF_ALL,
29+
}) :
30+
static_cast<NetPermissionFlags>(fuzzed_data_provider.ConsumeIntegral<uint32_t>());
31+
32+
NetWhitebindPermissions net_whitebind_permissions;
33+
std::string error_net_whitebind_permissions;
34+
if (NetWhitebindPermissions::TryParse(s, net_whitebind_permissions, error_net_whitebind_permissions)) {
35+
(void)NetPermissions::ToStrings(net_whitebind_permissions.m_flags);
36+
(void)NetPermissions::AddFlag(net_whitebind_permissions.m_flags, net_permission_flags);
37+
assert(NetPermissions::HasFlag(net_whitebind_permissions.m_flags, net_permission_flags));
38+
(void)NetPermissions::ClearFlag(net_whitebind_permissions.m_flags, net_permission_flags);
39+
(void)NetPermissions::ToStrings(net_whitebind_permissions.m_flags);
40+
}
41+
42+
NetWhitelistPermissions net_whitelist_permissions;
43+
std::string error_net_whitelist_permissions;
44+
if (NetWhitelistPermissions::TryParse(s, net_whitelist_permissions, error_net_whitelist_permissions)) {
45+
(void)NetPermissions::ToStrings(net_whitelist_permissions.m_flags);
46+
(void)NetPermissions::AddFlag(net_whitelist_permissions.m_flags, net_permission_flags);
47+
assert(NetPermissions::HasFlag(net_whitelist_permissions.m_flags, net_permission_flags));
48+
(void)NetPermissions::ClearFlag(net_whitelist_permissions.m_flags, net_permission_flags);
49+
(void)NetPermissions::ToStrings(net_whitelist_permissions.m_flags);
50+
}
51+
}

‎src/test/fuzz/timedata.cpp

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// Copyright (c) 2020 The Bitcoin Core developers
2+
// Distributed under the MIT software license, see the accompanying
3+
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
4+
5+
#include <test/fuzz/FuzzedDataProvider.h>
6+
#include <test/fuzz/fuzz.h>
7+
#include <test/fuzz/util.h>
8+
#include <timedata.h>
9+
10+
#include <cstdint>
11+
#include <string>
12+
#include <vector>
13+
14+
void test_one_input(const std::vector<uint8_t>& buffer)
15+
{
16+
FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
17+
const unsigned int max_size = fuzzed_data_provider.ConsumeIntegralInRange<unsigned int>(0, 1000);
18+
// Divide by 2 to avoid signed integer overflow in .median()
19+
const int64_t initial_value = fuzzed_data_provider.ConsumeIntegral<int64_t>() / 2;
20+
CMedianFilter<int64_t> median_filter{max_size, initial_value};
21+
while (fuzzed_data_provider.remaining_bytes() > 0) {
22+
(void)median_filter.median();
23+
assert(median_filter.size() > 0);
24+
assert(static_cast<size_t>(median_filter.size()) == median_filter.sorted().size());
25+
assert(static_cast<unsigned int>(median_filter.size()) <= max_size || max_size == 0);
26+
// Divide by 2 to avoid signed integer overflow in .median()
27+
median_filter.input(fuzzed_data_provider.ConsumeIntegral<int64_t>() / 2);
28+
}
29+
}

0 commit comments

Comments
 (0)