Skip to content

Commit 7b9a2dc

Browse files
tests: Add fuzzing harness for AdditionOverflow(...)
1 parent 44fb2a5 commit 7b9a2dc

File tree

3 files changed

+73
-0
lines changed

3 files changed

+73
-0
lines changed

src/Makefile.test.include

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

55
FUZZ_TARGETS = \
6+
test/fuzz/addition_overflow \
67
test/fuzz/addr_info_deserialize \
78
test/fuzz/addrdb \
89
test/fuzz/address_deserialize \
@@ -280,6 +281,12 @@ endif
280281

281282
if ENABLE_FUZZ
282283

284+
test_fuzz_addition_overflow_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
285+
test_fuzz_addition_overflow_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
286+
test_fuzz_addition_overflow_LDADD = $(FUZZ_SUITE_LD_COMMON)
287+
test_fuzz_addition_overflow_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
288+
test_fuzz_addition_overflow_SOURCES = test/fuzz/addition_overflow.cpp
289+
283290
test_fuzz_addr_info_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -DADDR_INFO_DESERIALIZE=1
284291
test_fuzz_addr_info_deserialize_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
285292
test_fuzz_addr_info_deserialize_LDADD = $(FUZZ_SUITE_LD_COMMON)

src/test/fuzz/addition_overflow.cpp

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
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+
9+
#include <cstdint>
10+
#include <string>
11+
#include <vector>
12+
13+
#if defined(__has_builtin)
14+
#if __has_builtin(__builtin_add_overflow)
15+
#define HAVE_BUILTIN_ADD_OVERFLOW
16+
#endif
17+
#elif defined(__GNUC__) && (__GNUC__ >= 5)
18+
#define HAVE_BUILTIN_ADD_OVERFLOW
19+
#endif
20+
21+
namespace {
22+
template <typename T>
23+
void TestAdditionOverflow(FuzzedDataProvider& fuzzed_data_provider)
24+
{
25+
const T i = fuzzed_data_provider.ConsumeIntegral<T>();
26+
const T j = fuzzed_data_provider.ConsumeIntegral<T>();
27+
const bool is_addition_overflow_custom = AdditionOverflow(i, j);
28+
#if defined(HAVE_BUILTIN_ADD_OVERFLOW)
29+
T result_builtin;
30+
const bool is_addition_overflow_builtin = __builtin_add_overflow(i, j, &result_builtin);
31+
assert(is_addition_overflow_custom == is_addition_overflow_builtin);
32+
if (!is_addition_overflow_custom) {
33+
assert(i + j == result_builtin);
34+
}
35+
#else
36+
if (!is_addition_overflow_custom) {
37+
(void)(i + j);
38+
}
39+
#endif
40+
}
41+
} // namespace
42+
43+
void test_one_input(const std::vector<uint8_t>& buffer)
44+
{
45+
FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
46+
TestAdditionOverflow<int64_t>(fuzzed_data_provider);
47+
TestAdditionOverflow<uint64_t>(fuzzed_data_provider);
48+
TestAdditionOverflow<int32_t>(fuzzed_data_provider);
49+
TestAdditionOverflow<uint32_t>(fuzzed_data_provider);
50+
TestAdditionOverflow<int16_t>(fuzzed_data_provider);
51+
TestAdditionOverflow<uint16_t>(fuzzed_data_provider);
52+
TestAdditionOverflow<char>(fuzzed_data_provider);
53+
TestAdditionOverflow<unsigned char>(fuzzed_data_provider);
54+
TestAdditionOverflow<signed char>(fuzzed_data_provider);
55+
}

src/test/fuzz/util.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,4 +120,15 @@ NODISCARD bool MultiplicationOverflow(const T i, const T j) noexcept
120120
}
121121
}
122122

123+
template <class T>
124+
NODISCARD bool AdditionOverflow(const T i, const T j) noexcept
125+
{
126+
static_assert(std::is_integral<T>::value, "Integral required.");
127+
if (std::numeric_limits<T>::is_signed) {
128+
return (i > 0 && j > std::numeric_limits<T>::max() - i) ||
129+
(i < 0 && j < std::numeric_limits<T>::min() - i);
130+
}
131+
return std::numeric_limits<T>::max() - i < j;
132+
}
133+
123134
#endif // BITCOIN_TEST_FUZZ_UTIL_H

0 commit comments

Comments
 (0)