Commit 9c048d90 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge remote-tracking branch 'public/bug10131_024'

parents b6004954 c56bb300

changes/bug10313

0 → 100644
+8 −0
Original line number Diff line number Diff line 
  o Minor bugfixes:

    - Fixed an erroneous pointer comparison that would have allowed

      compilers to remove a bounds check in channeltls.c. The fix

      was to remove the check entirely, since it was impossible for

      the code to overflow the bounds. Noticed by Jared L

      Wong. Fixes bug 10313 and 9980. Bugfix on 0.2.0.10-alpha.

src/or/channeltls.c

+8 −6
Original line number Diff line number Diff line
@@ -1435,12 +1435,14 @@ channel_tls_process_netinfo_cell(cell_t *cell, channel_tls_t *chan) 
  my_addr_ptr = (uint8_t*) cell->payload + 6;

  end = cell->payload + CELL_PAYLOAD_SIZE;

  cp = cell->payload + 6 + my_addr_len;

  if (cp >= end) {

    log_fn(LOG_PROTOCOL_WARN, LD_OR,

           "Addresses too long in netinfo cell; closing connection.");

    connection_or_close_for_error(chan->conn, 0);

    return;

  } else if (my_addr_type == RESOLVED_TYPE_IPV4 && my_addr_len == 4) {



  /* We used to check:

   *    if (my_addr_len >= CELL_PAYLOAD_SIZE - 6) {

   *

   * This is actually never going to happen, since my_addr_len is at most 255,

   * and CELL_PAYLOAD_LEN - 6 is 503.  So we know that cp is < end. */



  if (my_addr_type == RESOLVED_TYPE_IPV4 && my_addr_len == 4) {

    tor_addr_from_ipv4n(&my_apparent_addr, get_uint32(my_addr_ptr));

  } else if (my_addr_type == RESOLVED_TYPE_IPV6 && my_addr_len == 16) {

    tor_addr_from_ipv6_bytes(&my_apparent_addr, (const char *) my_addr_ptr);