From: George Kadianakis <desnacked@riseup.net>
Date: Thu, 2 Apr 2015 12:38:52 +0000 (+0100)
Subject: ... and if we do get multiple INTRODUCE1s on a circuit, kill the circuit
X-Git-Tag: tor-0.2.7.1-alpha~83
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8656cbcfc0cdce98d57e8f77d56bc8a69f5568b6;p=thirdparty%2Ftor.git

... and if we do get multiple INTRODUCE1s on a circuit, kill the circuit

(Sending a nak would be pointless.)

See ticket 15515 for discussion.
---

diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index f85562e042..2451acb514 100644
--- a/src/or/rendmid.c
+++ b/src/or/rendmid.c
@@ -157,7 +157,8 @@ rend_mid_introduce(or_circuit_t *circ, const uint8_t *request,
            "Blocking multiple introductions on the same circuit. "
            "Someone might be trying to attack a hidden service through "
            "this relay.");
-    goto err;
+    circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_TORPROTOCOL);
+    return -1;
   }
 
   circ->already_received_introduce1 = 1;