Prevent oracle attacks in the legacy protocol (CVE-2018-16737, CVE-2018-16738)

[tinc] / src / net_socket.c

diff --git a/src/net_socket.c b/src/net_socket.c
index 2da6253..15d32db 100644 (file)
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -41,7 +41,7 @@ int maxtimeout = 900;
 int seconds_till_retry = 5;
 int udp_rcvbuf = 1024 * 1024;
 int udp_sndbuf = 1024 * 1024;
-int max_connection_burst = 100;
+int max_connection_burst = 10;
 int fwmark;
 
 listen_socket_t listen_socket[MAXSOCKETS];
@@ -672,12 +672,6 @@ void handle_new_meta_connection(void *data, int flags) {
        // Check if we get many connections from the same host
 
        static sockaddr_t prev_sa;
-       static int tarpit = -1;
-
-       if(tarpit >= 0) {
-               closesocket(tarpit);
-               tarpit = -1;
-       }
 
        if(!sockaddrcmp_noport(&sa, &prev_sa)) {
                static int samehost_burst;
@@ -693,7 +687,7 @@ void handle_new_meta_connection(void *data, int flags) {
                samehost_burst++;
 
                if(samehost_burst > max_connection_burst) {
-                       tarpit = fd;
+                       tarpit(fd);
                        return;
                }
        }
@@ -716,7 +710,7 @@ void handle_new_meta_connection(void *data, int flags) {
 
        if(connection_burst >= max_connection_burst) {
                connection_burst = max_connection_burst;
-               tarpit = fd;
+               tarpit(fd);
                return;
        }
 
@@ -745,7 +739,6 @@ void handle_new_meta_connection(void *data, int flags) {
        connection_add(c);
 
        c->allow_request = ID;
-       send_id(c);
 }
 
 #ifndef HAVE_MINGW
@@ -782,8 +775,6 @@ void handle_new_unix_connection(void *data, int flags) {
        connection_add(c);
 
        c->allow_request = ID;
-
-       send_id(c);
 }
 #endif