Merge 6bc1eca into merged_master (Bitcoin PR bitcoin/bitcoin#22144)

ElementsProject · Jul 25, 2021 · ebffc84 · ebffc84
2 parents ee13854 + 6bc1eca
commit ebffc84
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/net.cpp b/src/net.cpp
@@ -2213,6 +2213,7 @@ void CConnman::OpenNetworkConnection(const CAddress& addrConnect, bool fCountFai
 
 void CConnman::ThreadMessageHandler()
 {
+    FastRandomContext rng;
     while (!flagInterruptMsgProc)
     {
         std::vector<CNode*> vNodesCopy;
@@ -2226,6 +2227,11 @@ void CConnman::ThreadMessageHandler()
 
         bool fMoreWork = false;
 
+        // Randomize the order in which we process messages from/to our peers.
+        // This prevents attacks in which an attacker exploits having multiple
+        // consecutive connections in the vNodes list.
+        Shuffle(vNodesCopy.begin(), vNodesCopy.end(), rng);
+
         for (CNode* pnode : vNodesCopy)
         {
             if (pnode->fDisconnect)