Skip to content

Commit 6bc1eca

Browse files
committed
Merge bitcoin/bitcoin#22144: Randomize message processing peer order
79c02c8 Randomize message processing peer order (Pieter Wuille) Pull request description: Right now, the message handling loop iterates the list of nodes always in the same order: the order they were connected in (see the `vNodes` vector). For some parts of the net processing logic, this order matters. Transaction requests are assigned explicitly to peers since #19988, but many other parts of processing work on a "first-served-by-loop-first" basis, such as block downloading. If peers can predict this ordering, it may be exploited to cause delays. As there isn't anything particularly optimal about the current ordering, just make it unpredictable by randomizing. Reported by Crypt-iQ. ACKs for top commit: jnewbery: ACK 79c02c8 Crypt-iQ: ACK 79c02c8 sdaftuar: utACK 79c02c8 achow101: Code Review ACK 79c02c8 jamesob: crACK bitcoin/bitcoin@79c02c8 jonatack: ACK 79c02c8 vasild: ACK 79c02c8 theStack: ACK 79c02c8 Tree-SHA512: 9a87c4dcad47c2d61b76c4f37f59674876b78f33f45943089bf159902a23e12de7a5feae1a73b17cbc3f2e37c980ecf0f7fd86af9e6fa3a68099537a3c82c106
2 parents eb63b1d + 79c02c8 commit 6bc1eca

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

src/net.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2213,6 +2213,7 @@ void CConnman::OpenNetworkConnection(const CAddress& addrConnect, bool fCountFai
22132213

22142214
void CConnman::ThreadMessageHandler()
22152215
{
2216+
FastRandomContext rng;
22162217
while (!flagInterruptMsgProc)
22172218
{
22182219
std::vector<CNode*> vNodesCopy;
@@ -2226,6 +2227,11 @@ void CConnman::ThreadMessageHandler()
22262227

22272228
bool fMoreWork = false;
22282229

2230+
// Randomize the order in which we process messages from/to our peers.
2231+
// This prevents attacks in which an attacker exploits having multiple
2232+
// consecutive connections in the vNodes list.
2233+
Shuffle(vNodesCopy.begin(), vNodesCopy.end(), rng);
2234+
22292235
for (CNode* pnode : vNodesCopy)
22302236
{
22312237
if (pnode->fDisconnect)

0 commit comments

Comments
 (0)