tor

commit 1bde356bf645f3c3d3b0a6e70c03e2baf9f89d26
parent 4abfcb7997e4a753643fd969317c502efc6be06e
Author: teor <teor@torproject.org>
Date:   Wed,  6 Nov 2019 11:19:30 +1000

Merge branch 'maint-0.2.9' into maint-0.3.5

Diffstat:
A
changes/bug31107
 | 
4
++++
M
src/core/or/channeltls.c
 | 
10
+++++++++-

2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/changes/bug31107 b/changes/bug31107
@@ -0,0 +1,4 @@
+  o Minor bugfixes (logging, protocol violations):
+    - Do not log a nonfatal assertion failure when receiving a VERSIONS
+      cell on a connection using the obsolete v1 link protocol. Log a
+      protocol_warn instead. Fixes bug 31107; bugfix on 0.2.4.4-alpha.
diff --git a/src/core/or/channeltls.c b/src/core/or/channeltls.c
@@ -1108,7 +1108,15 @@ channel_tls_handle_cell(cell_t *cell, or_connection_t *conn)
       /* do nothing */
       break;
     case CELL_VERSIONS:
-      tor_fragile_assert();
+      /* A VERSIONS cell should always be a variable-length cell, and
+       * so should never reach this function (which handles constant-sized
+       * cells). But if the connection is using the (obsolete) v1 link
+       * protocol, all cells will be treated as constant-sized, and so
+       * it's possible we'll reach this code.
+       */
+      log_fn(LOG_PROTOCOL_WARN, LD_CHANNEL,
+             "Received unexpected VERSIONS cell on a channel using link "
+             "protocol %d; ignoring.", conn->link_proto);
       break;
     case CELL_NETINFO:
       ++stats_n_netinfo_cells_processed;