Commit 56a7c5bc authored by David Goulet's avatar David Goulet 🐼 Committed by Nick Mathewson
Browse files

TROVE-2017-005: Fix assertion failure in connection_edge_process_relay_cell 



On an hidden service rendezvous circuit, a BEGIN_DIR could be sent
(maliciously) which would trigger a tor_assert() because
connection_edge_process_relay_cell() thought that the circuit is an
or_circuit_t but is an origin circuit in reality.

Fixes #22494

Reported-by: Roger Dingledine's avatarRoger Dingledine <arma@torproject.org>
Signed-off-by: David Goulet's avatarDavid Goulet <dgoulet@torproject.org>
parent 4ee48cb4

changes/trove-2017-005

0 → 100644
+7 −0
Original line number Diff line number Diff line 
  o Major bugfixes (hidden service, relay, security):

    - Fix an assertion failure caused by receiving a BEGIN_DIR cell on

      a hidden service rendezvous circuit. Fixes bug 22494, tracked as

      TROVE-2017-005 and CVE-2017-0376; bugfix on 0.2.2.1-alpha. Found

      by armadev.

src/or/relay.c

+2 −1
Original line number Diff line number Diff line
@@ -1297,7 +1297,8 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, 
               "Begin cell for known stream. Dropping.");

        return 0;

      }

      if (rh.command == RELAY_COMMAND_BEGIN_DIR) {

      if (rh.command == RELAY_COMMAND_BEGIN_DIR &&

          circ->purpose != CIRCUIT_PURPOSE_S_REND_JOINED) {

        /* Assign this circuit and its app-ward OR connection a unique ID,

         * so that we can measure download times. The local edge and dir

         * connection will be assigned the same ID when they are created