[tor-commits] [tor/release-0.2.4] ... and if we do get multiple INTRODUCE1s on a circuit, kill the circuit

[nickm at torproject.org]

commit bcb839387ef65c0a87ca0a6b7957c3062188c601
Author: George Kadianakis <desnacked at riseup.net>
Date:   Thu Apr 2 13:38:52 2015 +0100

    ... and if we do get multiple INTRODUCE1s on a circuit, kill the circuit
    
    (Sending a nak would be pointless.)
    
    See ticket 15515 for discussion.
---
 src/or/rendmid.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index 2f75ffb..0a005a6 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;