1 files changed, 48 insertions, 4 deletions

diff --git a/src/btftunnel.cpp b/src/btftunnel.cpp
index 63d178b..2b3f818 100644
--- a/src/btftunnel.cpp
+++ b/src/btftunnel.cpp
@@ -25,8 +25,10 @@ typedef int SOCKET;
 #endif
 #include "sockcount.h"
 #include <cstring>
+#include <cstdio>
 #include <vector>
 #include <thread>
+#include <system_error>
 
 namespace btf
 {
@@ -121,18 +123,60 @@ static void PumpIn(SOCKET pumpEnd, RvSocket rv, std::vector<unsigned char> key)
 
 // Start the two pumps and hand back the app-facing socket. When both pumps
 // finish, close the pump end and the rendezvous socket.
+//
+// Every tunnel is two threads, and a tunnel is one peer connection (a .btf
+// dial or accept, a pool miner, a participant's pool session) -- so the
+// thread count scales with peer count, which is attacker-influenced. When
+// pthread_create is refused std::thread throws std::system_error; uncaught it
+// reached std::terminate and took the whole process down over one connection
+// it could not serve. Both spawns are guarded, and the failure paths return
+// INVALID_SOCKET, which every caller already handles by dropping just that
+// connection.
 static btf_socket_t StartTunnel(RvSocket rv, const unsigned char shared[32])
 {
     btf_socket_t appEnd, pumpEnd;
     if (!MakeLocalPair(appEnd, pumpEnd)) { RvClose(rv); return INVALID_SOCKET; }
 
     std::vector<unsigned char> key(shared, shared + 32);
-    std::thread(PumpOut, pumpEnd, rv, key).detach();
-    std::thread([pumpEnd, rv, key]() {
-        PumpIn(pumpEnd, rv, key);
+
+    // The inbound pump starts first because it owns the cleanup: it closes
+    // pumpEnd and rv when it exits. That ownership is what makes the second
+    // spawn's failure path below race-free.
+    try
+    {
+        std::thread([pumpEnd, rv, key]() {
+            PumpIn(pumpEnd, rv, key);
+            BtfCloseSocket(pumpEnd);
+            RvClose(rv);
+        }).detach();
+    }
+    catch (const std::system_error& e)
+    {
+        // Nothing is running yet, so closing everything here is safe.
+        fprintf(stderr, "btf tunnel: cannot spawn inbound pump (%s), tunnel dropped\n",
+                e.what());
         BtfCloseSocket(pumpEnd);
+        BtfCloseSocket(appEnd);
         RvClose(rv);
-    }).detach();
+        return INVALID_SOCKET;
+    }
+
+    try
+    {
+        std::thread(PumpOut, pumpEnd, rv, key).detach();
+    }
+    catch (const std::system_error& e)
+    {
+        // The inbound pump is parked in RvReadN(rv). shutdown() wakes it, and
+        // it closes pumpEnd and rv itself -- closing them here instead would
+        // race exactly that, and a reused descriptor is how an unrelated
+        // socket gets closed.
+        fprintf(stderr, "btf tunnel: cannot spawn outbound pump (%s), tunnel dropped\n",
+                e.what());
+        shutdown((SOCKET)rv, SD_BOTH);
+        BtfCloseSocket(appEnd);
+        return INVALID_SOCKET;
+    }
     return appEnd;
 }