June 2021 - tor-commits - lists.torproject.org

[tor/release-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by nickm＠torproject.org 14 Jun '21

14 Jun '21

commit 69bd4a8a2db6645b69a902d5ef6eb8c832f122fc Merge: 1d11675adb 1da8621c0a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 10 08:42:15 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/bug40391 | 9 +++++++++ src/core/or/circuitmux.c | 7 ++++--- 2 files changed, 13 insertions(+), 3 deletions(-)

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by nickm＠torproject.org 14 Jun '21

14 Jun '21

commit 3260d323a663da3a1a2b65085dce1b469be101bb Merge: 69bd4a8a2d ec696a95e5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 10 08:53:07 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/ticket40389 | 3 +++ src/core/or/relay.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+)

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.6' into release-0.4.6
by nickm＠torproject.org 14 Jun '21

14 Jun '21

commit a2b0d7ead432907944d78648ab95a7e2682c69db Merge: f6ebe8b920 3260d323a6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 10 08:53:07 2021 -0400 Merge branch 'maint-0.4.6' into release-0.4.6 changes/ticket40389 | 3 +++ src/core/or/relay.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+)

1 0

[tor/release-0.4.6] TROVE-2021-003: Check layer_hint before half-closed end and resolve cells
by nickm＠torproject.org 14 Jun '21

14 Jun '21

commit adb248b6d6e0779719e6b873ee12a1e22fa390f4 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jun 3 09:33:21 2021 -0400 TROVE-2021-003: Check layer_hint before half-closed end and resolve cells This issue was reported by Jann Horn part of Google's Project Zero. Jann's one-sentence summary: entry/middle relays can spoof RELAY_END cells on half-closed streams, which can lead to stream confusion between OP and exit. Fixes #40389 --- changes/ticket40389 | 3 +++ src/core/or/relay.c | 25 +++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/changes/ticket40389 b/changes/ticket40389 new file mode 100644 index 0000000000..7dcf65b32e --- /dev/null +++ b/changes/ticket40389 @@ -0,0 +1,3 @@ + o Major bugfixes (relay, TROVE): + - Don't allow entry or middle relays to spoof RELAY_END or RELAY_RESOLVED + cell on half-closed streams. Fixes bug 40389; bugfix on 0.3.5.1-alpha. diff --git a/src/core/or/relay.c b/src/core/or/relay.c index f5fc1cfbb3..00353f47a9 100644 --- a/src/core/or/relay.c +++ b/src/core/or/relay.c @@ -1428,6 +1428,25 @@ connection_edge_process_relay_cell_not_open( // return -1; } +/** + * Return true iff our decryption layer_hint is from the last hop + * in a circuit. + */ +static bool +relay_crypt_from_last_hop(origin_circuit_t *circ, crypt_path_t *layer_hint) +{ + tor_assert(circ); + tor_assert(layer_hint); + tor_assert(circ->cpath); + + if (layer_hint != circ->cpath->prev) { + log_fn(LOG_PROTOCOL_WARN, LD_CIRC, + "Got unexpected relay data from intermediate hop"); + return false; + } + return true; +} + /** An incoming relay cell has arrived on circuit circ. If * conn is NULL this is a control cell, else cell is * destined for conn. @@ -1616,7 +1635,8 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, if (!conn) { if (CIRCUIT_IS_ORIGIN(circ)) { origin_circuit_t *ocirc = TO_ORIGIN_CIRCUIT(circ); - if (connection_half_edge_is_valid_end(ocirc->half_streams, + if (relay_crypt_from_last_hop(ocirc, layer_hint) && + connection_half_edge_is_valid_end(ocirc->half_streams, rh.stream_id)) { circuit_read_valid_data(ocirc, rh.length); @@ -1918,7 +1938,8 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, if (CIRCUIT_IS_ORIGIN(circ)) { origin_circuit_t *ocirc = TO_ORIGIN_CIRCUIT(circ); - if (connection_half_edge_is_valid_resolved(ocirc->half_streams, + if (relay_crypt_from_last_hop(ocirc, layer_hint) && + connection_half_edge_is_valid_resolved(ocirc->half_streams, rh.stream_id)) { circuit_read_valid_data(ocirc, rh.length); log_info(domain,

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.6' into release-0.4.6
by nickm＠torproject.org 14 Jun '21

14 Jun '21

commit 5481412cd7e1ffadc20a31ddf93dc1222210e7df Merge: a2b0d7ead4 7be37a26ac Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 10 09:55:55 2021 -0400 Merge branch 'maint-0.4.6' into release-0.4.6 src/core/or/relay.c | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-)

1 0

[tor/release-0.4.6] Fold entries into changelog and releasenotes
by nickm＠torproject.org 14 Jun '21

14 Jun '21

commit 15b0980bd7b840c8d2de134e56a09dadf7b4683e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 10 13:13:29 2021 -0400 Fold entries into changelog and releasenotes --- ChangeLog | 37 +++++++++++++++++++++++++++++++++++++ ReleaseNotes | 37 +++++++++++++++++++++++++++++++++++++ changes/bug40391 | 9 --------- changes/bug40392 | 4 ---- changes/geoip-2021-06-10 | 3 --- changes/ticket40389 | 3 --- changes/ticket40390 | 8 -------- 7 files changed, 74 insertions(+), 27 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7169fd1a4d..2420b77780 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,43 @@ Changes in version 0.4.6.5 - 2021-06-1? Below are the changes since 0.4.6.4-rc. For a complete list of changes since 0.4.5.8, see the ReleaseNotes file. + o Major bugfixes (security): + - Don't allow relays to spoof RELAY_END or RELAY_RESOLVED cell on + half-closed streams. Previously, clients failed to validate which + hop sent these cells: this would allow a relay on a circuit to end + a stream that wasn't actually built with it. Fixes bug 40389; + bugfix on 0.3.5.1-alpha. This issue is also tracked as TROVE-2021- + 003 and CVE-2021-34548. + + o Major bugfixes (security, defense-in-depth): + - Detect more failure conditions from the OpenSSL RNG code. + Previously, we would detect errors from a missing RNG + implementation, but not failures from the RNG code itself. + Fortunately, it appears those failures do not happen in practice + when Tor is using OpenSSL's default RNG implementation. Fixes bug + 40390; bugfix on 0.2.8.1-alpha. This issue is also tracked as + TROVE-2021-004. Reported by Jann Horn at Google's Project Zero. + + o Major bugfixes (security, denial of service): + - Resist a hashtable-based CPU denial-of-service attack against + relays. Previously we used a naive unkeyed hash function to look + up circuits in a circuitmux object. An attacker could exploit this + to construct circuits with chosen circuit IDs, to create + collisions and make the hash table inefficient. Now we use a + SipHash construction here instead. Fixes bug 40391; bugfix on + 0.2.4.4-alpha. This issue is also tracked as TROVE-2021-005 and + CVE-2021-34549. Reported by Jann Horn from Google's Project Zero. + - Fix an out-of-bounds memory access in v3 onion service descriptor + parsing. An attacker could exploit this bug by crafting an onion + service descriptor that would crash any client that tried to visit + it. Fixes bug 40392; bugfix on 0.3.0.1-alpha. This issue is also + tracked as TROVE-2021-006 and CVE-2021-34550. Reported by Sergei + Glazunov from Google's Project Zero. + + o Minor features (geoip data): + - Update the geoip files to match the IPFire Location Database, as + retrieved on 2021/06/10. + o Minor features (logging, diagnostic): - Log decompression failures at a higher severity level, since they can help provide missing context for other warning messages. We diff --git a/ReleaseNotes b/ReleaseNotes index d567fa4463..7c6da85d05 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -8,6 +8,39 @@ Changes in version 0.4.6.5 - 2021-06-1? Below are the changes since 0.4.5.8. For a list of changes since 0.4.6.4-rc, see the ChangeLog file. + o Major bugfixes (security): + - Don't allow relays to spoof RELAY_END or RELAY_RESOLVED cell on + half-closed streams. Previously, clients failed to validate which + hop sent these cells: this would allow a relay on a circuit to end + a stream that wasn't actually built with it. Fixes bug 40389; + bugfix on 0.3.5.1-alpha. This issue is also tracked as TROVE-2021- + 003 and CVE-2021-34548. + + o Major bugfixes (security, defense-in-depth): + - Detect more failure conditions from the OpenSSL RNG code. + Previously, we would detect errors from a missing RNG + implementation, but not failures from the RNG code itself. + Fortunately, it appears those failures do not happen in practice + when Tor is using OpenSSL's default RNG implementation. Fixes bug + 40390; bugfix on 0.2.8.1-alpha. This issue is also tracked as + TROVE-2021-004. Reported by Jann Horn at Google's Project Zero. + + o Major bugfixes (security, denial of service): + - Resist a hashtable-based CPU denial-of-service attack against + relays. Previously we used a naive unkeyed hash function to look + up circuits in a circuitmux object. An attacker could exploit this + to construct circuits with chosen circuit IDs, to create + collisions and make the hash table inefficient. Now we use a + SipHash construction here instead. Fixes bug 40391; bugfix on + 0.2.4.4-alpha. This issue is also tracked as TROVE-2021-005 and + CVE-2021-34549. Reported by Jann Horn from Google's Project Zero. + - Fix an out-of-bounds memory access in v3 onion service descriptor + parsing. An attacker could exploit this bug by crafting an onion + service descriptor that would crash any client that tried to visit + it. Fixes bug 40392; bugfix on 0.3.0.1-alpha. This issue is also + tracked as TROVE-2021-006 and CVE-2021-34550. Reported by Sergei + Glazunov from Google's Project Zero. + o Major features (control port, onion services): - Add controller support for creating version 3 onion services with client authorization. Previously, only v2 onion services could be @@ -114,6 +147,10 @@ Changes in version 0.4.6.5 - 2021-06-1? control over whether the client can become dormant from inactivity. Most people won't need this. Closes ticket 40228. + o Minor features (geoip data): + - Update the geoip files to match the IPFire Location Database, as + retrieved on 2021/06/10. + o Minor features (logging): - Edit heartbeat log messages so that more of them begin with the string "Heartbeat: ". Closes ticket 40322; patch diff --git a/changes/bug40391 b/changes/bug40391 deleted file mode 100644 index e3c186275f..0000000000 --- a/changes/bug40391 +++ /dev/null @@ -1,9 +0,0 @@ - o Major bugfixes (security): - - Resist a hashtable-based CPU denial-of-service attack against - relays. Previously we used a naive unkeyed hash function to look up - circuits in a circuitmux object. An attacker could exploit this to - construct circuits with chosen circuit IDs in order to try to create - collisions and make the hash table inefficient. Now we use a SipHash - construction for this hash table instead. Fixes bug 40391; bugfix on - 0.2.4.4-alpha. This issue is also tracked as TROVE-2021-005. - Reported by Jann Horn from Google's Project Zero. diff --git a/changes/bug40392 b/changes/bug40392 deleted file mode 100644 index 4dffa50bb2..0000000000 --- a/changes/bug40392 +++ /dev/null @@ -1,4 +0,0 @@ - o Major bugfixes (security, denial of service, onion services): - - Fix an out-of-bounds memory access in v3 descriptor parsing. Fixes bug - 40392; bugfix on 0.3.0.1-alpha. This issue is also tracked as - TROVE-2021-006. Reported by Sergei Glazunov from Google's Project Zero. \ No newline at end of file diff --git a/changes/geoip-2021-06-10 b/changes/geoip-2021-06-10 deleted file mode 100644 index 2b798012c8..0000000000 --- a/changes/geoip-2021-06-10 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features (geoip data): - - Update the geoip files to match the IPFire Location Database, - as retrieved on 2021/06/10. diff --git a/changes/ticket40389 b/changes/ticket40389 deleted file mode 100644 index 7dcf65b32e..0000000000 --- a/changes/ticket40389 +++ /dev/null @@ -1,3 +0,0 @@ - o Major bugfixes (relay, TROVE): - - Don't allow entry or middle relays to spoof RELAY_END or RELAY_RESOLVED - cell on half-closed streams. Fixes bug 40389; bugfix on 0.3.5.1-alpha. diff --git a/changes/ticket40390 b/changes/ticket40390 deleted file mode 100644 index b56fa4d9da..0000000000 --- a/changes/ticket40390 +++ /dev/null @@ -1,8 +0,0 @@ - o Major bugfixes (security, defense-in-depth): - - Detect a wider variety of failure conditions from the OpenSSL RNG - code. Previously, we would detect errors from a missing RNG - implementation, but not failures from the RNG code itself. - Fortunately, it appears those failures do not happen in practice - when Tor is using OpenSSL's default RNG implementation. - Fixes bug 40390; bugfix on 0.2.8.1-alpha. This issue is also tracked as - TROVE-2021-004. Reported by Jann Horn at Google's Project Zero.

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.6' into release-0.4.6
by nickm＠torproject.org 14 Jun '21

14 Jun '21

commit 58ad0302ea9acea48308f35dce4afa986919a151 Merge: 5481412cd7 8e590992c4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 10 12:30:29 2021 -0400 Merge branch 'maint-0.4.6' into release-0.4.6 changes/bug40392 | 4 ++++ src/feature/hs/hs_descriptor.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.6] Resolve remaining merge conflicts in relay.c
by nickm＠torproject.org 14 Jun '21

14 Jun '21

commit 014345ed6abca3305fcbdea3b75a23adc3976926 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 10 09:55:35 2021 -0400 Resolve remaining merge conflicts in relay.c (My bad!) --- src/core/or/relay.c | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/src/core/or/relay.c b/src/core/or/relay.c index 78fda99a45..892dbe2d0a 100644 --- a/src/core/or/relay.c +++ b/src/core/or/relay.c @@ -1735,17 +1735,9 @@ handle_relay_cell_command(cell_t *cell, circuit_t *circ, if (!conn) { if (CIRCUIT_IS_ORIGIN(circ)) { origin_circuit_t *ocirc = TO_ORIGIN_CIRCUIT(circ); -<<<<<<< HEAD - if (connection_half_edge_is_valid_end(ocirc->half_streams, - rh->stream_id)) { -||||||| d71bf986b4faf7 - if (connection_half_edge_is_valid_end(ocirc->half_streams, - rh.stream_id)) { -======= if (relay_crypt_from_last_hop(ocirc, layer_hint) && connection_half_edge_is_valid_end(ocirc->half_streams, - rh.stream_id)) { ->>>>>>> maint-0.3.5 + rh->stream_id)) { circuit_read_valid_data(ocirc, rh->length); log_info(domain, @@ -1954,20 +1946,10 @@ handle_relay_cell_command(cell_t *cell, circuit_t *circ, if (CIRCUIT_IS_ORIGIN(circ)) { origin_circuit_t *ocirc = TO_ORIGIN_CIRCUIT(circ); -<<<<<<< HEAD - if (connection_half_edge_is_valid_resolved(ocirc->half_streams, - rh->stream_id)) { - circuit_read_valid_data(ocirc, rh->length); -||||||| d71bf986b4faf7 - if (connection_half_edge_is_valid_resolved(ocirc->half_streams, - rh.stream_id)) { - circuit_read_valid_data(ocirc, rh.length); -======= if (relay_crypt_from_last_hop(ocirc, layer_hint) && connection_half_edge_is_valid_resolved(ocirc->half_streams, - rh.stream_id)) { - circuit_read_valid_data(ocirc, rh.length); ->>>>>>> maint-0.3.5 + rh->stream_id)) { + circuit_read_valid_data(ocirc, rh->length); log_info(domain, "resolved cell on circ %u valid on half-closed " "stream id %d", ocirc->global_identifier, rh->stream_id);

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.4' into maint-0.4.5
by nickm＠torproject.org 14 Jun '21

14 Jun '21

commit ec696a95e58870862625a44f2c9152be2526414c Merge: 1da8621c0a 0f2d45328d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 10 08:53:07 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 changes/ticket40389 | 3 +++ src/core/or/relay.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+)

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.6' into release-0.4.6
by nickm＠torproject.org 14 Jun '21

14 Jun '21

commit f6ebe8b92081f6618c5c033c29b40df8db34b953 Merge: c58c2d4e37 69bd4a8a2d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 10 08:42:15 2021 -0400 Merge branch 'maint-0.4.6' into release-0.4.6 changes/bug40391 | 9 +++++++++ src/core/or/circuitmux.c | 7 ++++--- 2 files changed, 13 insertions(+), 3 deletions(-)

1 0