Bug found! Wrong pointer was used for handling multiple ADD_HOST requests

[tinc] / src / protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index 1460fbf..0e250da 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -323,6 +323,14 @@ int send_key_answer(conn_list_t *cl, ip_t to)
   strcpy(&tmp->key, my_public_key_base36);
 
   fw = lookup_conn(to);
+  
+  if(!fw)
+  {
+    syslog(LOG_ERR, "Attempting to send key answer to " IP_ADDR_S ", which does not exist?",
+          IP_ADDR_V(to));
+    return -1;
+  }
+  
   if(debug_lvl > 2)
     syslog(LOG_DEBUG, "Sending public key to " IP_ADDR_S,
           IP_ADDR_V(fw->nexthop->vpn_ip));
@@ -483,7 +491,7 @@ int ack_h(conn_list_t *cl, unsigned char *d, int len)
     {
       if(request_handlers[d[1]] == NULL)
        syslog(LOG_ERR, "Unknown request %d.", d[1]);
-      if(request_handlers[d[1]](cl, d, len - 1) < 0)
+      if(request_handlers[d[1]](cl, d + 1, len - 1) < 0)
        return -1;
     }
 
@@ -589,12 +597,13 @@ int add_host_h(conn_list_t *cl, unsigned char *d, int len)
 
   /*
     again, i'm cheating here. see the comment in ack_h.
+    Naughty zarq! Now you see what cheating will get you... [GS]
   */
   if(len > sizeof(add_host_t)) /* Another ADD_HOST follows */
     {
       if(request_handlers[d[sizeof(add_host_t)]] == NULL)
        syslog(LOG_ERR, "Unknown request %d.", d[sizeof(add_host_t)]);
-      if(request_handlers[d[sizeof(add_host_t)]](cl, d, len - sizeof(add_host_t)) < 0)
+      if(request_handlers[d[sizeof(add_host_t)]](cl, d + sizeof(add_host_t), len - sizeof(add_host_t)) < 0)
        return -1;
     }
 
@@ -617,6 +626,14 @@ int req_key_h(conn_list_t *cl, unsigned char *d, int len)
     }
 
   fw = lookup_conn(tmp->to);
+  
+  if(!fw)
+  {
+    syslog(LOG_ERR, "Attempting to forward key request to " IP_ADDR_S ", which does not exist?",
+          IP_ADDR_V(tmp->to));
+    return -1;
+  }
+
   if(debug_lvl > 3)
     syslog(LOG_DEBUG, "Forwarding request for public key to " IP_ADDR_S,
           IP_ADDR_V(fw->nexthop->vpn_ip));
@@ -673,6 +690,14 @@ int ans_key_h(conn_list_t *cl, unsigned char *d, int len)
       if(debug_lvl > 2)
        syslog(LOG_DEBUG, "Yeah! key arrived. Now do something with it.");
       gk = lookup_conn(tmp->from);
+
+      if(!gk)
+        {
+          syslog(LOG_ERR, "Receiving key from " IP_ADDR_S ", which does not exist?",
+                IP_ADDR_V(tmp->from));
+          return -1;
+        }
+
       set_keys(gk, tmp);
       gk->status.validkey = 1;
       gk->status.waitingforkey = 0;
@@ -681,6 +706,14 @@ int ans_key_h(conn_list_t *cl, unsigned char *d, int len)
     }
 
   fw = lookup_conn(tmp->to);
+  
+  if(!fw)
+  {
+    syslog(LOG_ERR, "Attempting to forward key to " IP_ADDR_S ", which does not exist?",
+          IP_ADDR_V(tmp->to));
+    return -1;
+  }
+
   if(debug_lvl > 2)
     syslog(LOG_DEBUG, "Forwarding public key to " IP_ADDR_S,
           IP_ADDR_V(fw->nexthop->vpn_ip));
@@ -703,6 +736,14 @@ int key_changed_h(conn_list_t *cl, unsigned char *d, int len)
           IP_ADDR_V(tmp->from));
 
   ik = lookup_conn(tmp->from);
+
+  if(!ik)
+    {
+      syslog(LOG_ERR, "Got changed key from " IP_ADDR_S ", which does not exist?",
+            IP_ADDR_V(tmp->from));
+      return -1;
+    }
+
   ik->status.validkey = 0;
   ik->status.waitingforkey = 0;