November 2019 - tor-commits - lists.torproject.org

[tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2
by teor＠torproject.org 25 Nov '19

25 Nov '19

commit aa73b30dfac927c565f553e93685e3c3dd4a2118 Merge: 7f43d24e0 3d6545250 Author: teor <teor(a)torproject.org> Date: Mon Nov 25 12:37:21 2019 +1000 Merge branch 'maint-0.4.2' into release-0.4.2 doc/HACKING/CodingStandards.md | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-)

1 0

[tor/release-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 25 Nov '19

25 Nov '19

commit 055f5d4d1b2c8ea5a85691f7110e82a9c468b6dd Merge: c17ab20ac 501b5174d Author: teor <teor(a)torproject.org> Date: Mon Nov 25 12:36:59 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug30344 | 4 ++++ changes/bug31939 | 3 +++ changes/ticket28970 | 6 ++++++ changes/ticket31548 | 7 +++++++ changes/ticket32058 | 5 +++++ src/core/mainloop/connection.c | 18 ++++++++++++------ src/core/mainloop/mainloop.c | 10 ++++++++++ src/core/mainloop/periodic.c | 5 +++++ src/feature/hs/hs_client.c | 8 ++++++-- src/feature/hs/hs_service.c | 9 +++++++++ src/lib/tls/buffers_tls.c | 4 ++-- 11 files changed, 69 insertions(+), 10 deletions(-)

1 0

[tor/release-0.4.2] Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.0
by teor＠torproject.org 25 Nov '19

25 Nov '19

commit c17ab20ac0d3efb1b9c46fa12685db5b09015481 Merge: ed6f2f61a a7ccd9a99 Author: teor <teor(a)torproject.org> Date: Mon Nov 25 12:36:41 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.0 changes/bug32108 | 8 ++++++++ src/core/mainloop/mainloop.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.2] Merge remote-tracking branch 'tor-github/pr/1464' into maint-0.3.5
by teor＠torproject.org 25 Nov '19

25 Nov '19

commit 501b5174d84a121fe5932433e54b2929a5c2876d Merge: 400cee261 ed57a04a6 Author: teor <teor(a)torproject.org> Date: Mon Nov 25 12:35:11 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1464' into maint-0.3.5 changes/ticket28970 | 6 ++++++ src/feature/hs/hs_client.c | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.2] Merge branch 'maint-0.4.0' into maint-0.4.1
by teor＠torproject.org 25 Nov '19

25 Nov '19

commit 26071aa3be8f26d7e81384f1d40bb1d5fe94cca0 Merge: 29eb7b07e 055f5d4d1 Author: teor <teor(a)torproject.org> Date: Mon Nov 25 12:37:07 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/bug30344 | 4 ++++ changes/bug31939 | 3 +++ changes/bug32108 | 8 ++++++++ changes/ticket28970 | 6 ++++++ changes/ticket31091 | 3 +++ changes/ticket31548 | 7 +++++++ changes/ticket32058 | 5 +++++ src/core/mainloop/connection.c | 18 ++++++++++++------ src/core/mainloop/mainloop.c | 12 +++++++++++- src/core/mainloop/periodic.c | 5 +++++ src/feature/client/transports.c | 6 ++---- src/feature/hs/hs_client.c | 8 ++++++-- src/feature/hs/hs_service.c | 9 +++++++++ src/lib/tls/buffers_tls.c | 4 ++-- 14 files changed, 83 insertions(+), 15 deletions(-)

1 0

[tor/release-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2
by teor＠torproject.org 25 Nov '19

25 Nov '19

commit 3d6545250e49b732292bb8ac1a3f01d198537b0b Merge: 969ee5d77 26071aa3b Author: teor <teor(a)torproject.org> Date: Mon Nov 25 12:37:15 2019 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2

1 0

[tor/release-0.4.2] Merge remote-tracking branch 'tor-github/pr/1396' into maint-0.4.0
by teor＠torproject.org 25 Nov '19

25 Nov '19

commit ed6f2f61a260a08d9e8f315e4397335fa39383be Merge: 329aa1c48 389b37246 Author: teor <teor(a)torproject.org> Date: Mon Nov 25 12:35:58 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1396' into maint-0.4.0 changes/ticket31091 | 3 +++ src/feature/client/transports.c | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-)

1 0

[tor/release-0.3.5] tls: Log TLS read buffer length bugs once
by teor＠torproject.org 25 Nov '19

25 Nov '19

commit ff304f3be7d6b5753d2066a0af9772b451f7f442 Author: teor <teor(a)torproject.org> Date: Fri Oct 4 12:33:34 2019 +1000 tls: Log TLS read buffer length bugs once Rather than filling the logs with similar warnings. Fixes bug 31939; bugfix on 0.3.0.4-rc. --- changes/bug31939 | 3 +++ src/lib/tls/buffers_tls.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/bug31939 b/changes/bug31939 new file mode 100644 index 000000000..a36ea495d --- /dev/null +++ b/changes/bug31939 @@ -0,0 +1,3 @@ + o Minor bugfixes (tls, logging): + - Log TLS read buffer length bugs once, rather than filling the logs + with similar warnings. Fixes bug 31939; bugfix on 0.3.0.4-rc. diff --git a/src/lib/tls/buffers_tls.c b/src/lib/tls/buffers_tls.c index c176162c3..e92cb9163 100644 --- a/src/lib/tls/buffers_tls.c +++ b/src/lib/tls/buffers_tls.c @@ -68,9 +68,9 @@ buf_read_from_tls(buf_t *buf, tor_tls_t *tls, size_t at_most) check_no_tls_errors(); - if (BUG(buf->datalen >= INT_MAX)) + IF_BUG_ONCE(buf->datalen >= INT_MAX) return -1; - if (BUG(buf->datalen >= INT_MAX - at_most)) + IF_BUG_ONCE(buf->datalen >= INT_MAX - at_most) return -1; while (at_most > total_read) {

1 0

[tor/release-0.3.5] mainloop: Disable periodic events before a destroy
by teor＠torproject.org 25 Nov '19

25 Nov '19

commit 4a8d4913227ea1d6b9302cda4703516595a3c1b5 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 15 13:33:48 2019 -0400 mainloop: Disable periodic events before a destroy When tearing down all periodic events during shutdown, disable them first so their enable flag is updated. This allows the tor_api.h to relaunch tor properly after a clean shutdown. Fixes #32058 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket32058 | 5 +++++ src/core/mainloop/periodic.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/changes/ticket32058 b/changes/ticket32058 new file mode 100644 index 000000000..b40bcda41 --- /dev/null +++ b/changes/ticket32058 @@ -0,0 +1,5 @@ + o Minor bugfixes (mainloop, periodic events): + - Periodic events enabled flag was not unset properly when shutting down tor + cleanly. This had the side effect to not re-enable periodic events when + tor_api.h is used to relaunch tor after a shutdown. Fixes bug 32058; + bugfix on 0.3.3.1-alpha. diff --git a/src/core/mainloop/periodic.c b/src/core/mainloop/periodic.c index 34690c54d..2651bbbc8 100644 --- a/src/core/mainloop/periodic.c +++ b/src/core/mainloop/periodic.c @@ -137,6 +137,11 @@ periodic_event_destroy(periodic_event_item_t *event) { if (!event) return; + + /* First disable the event so we first cancel the event and set its enabled + * flag properly. */ + periodic_event_disable(event); + mainloop_event_free(event->ev); event->last_action_time = 0; }

1 0

[tor/release-0.3.5] hs-v3: Remove a BUG() caused by an acceptable race
by teor＠torproject.org 25 Nov '19

25 Nov '19

commit ed57a04a65a59ee744910a9db22a81359dac3491 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Oct 23 10:20:09 2019 -0400 hs-v3: Remove a BUG() caused by an acceptable race hs_client_purge_state() and hs_cache_clean_as_client() can remove a descriptor from the client cache with a NEWNYM or simply when the descriptor expires. Which means that for an INTRO circuit being established during that time, once it opens, we lookup the descriptor to get the IP object but hey surprised, no more descriptor. The approach here is minimalist that is accept the race and close the circuit since we can not continue. Before that, the circuit would stay opened and the client wait the SockTimeout. Fixers #28970. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket28970 | 6 ++++++ src/feature/hs/hs_client.c | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/changes/ticket28970 b/changes/ticket28970 new file mode 100644 index 000000000..138c575fc --- /dev/null +++ b/changes/ticket28970 @@ -0,0 +1,6 @@ + o Minor bugfixes (clietn, hidden service v3): + - Fix a BUG() assertion that occurs within a very small race window between + a client intro circuit opens and its descriptor that gets cleaned up from + the cache. The circuit is now closed which will trigger a re-fetch of the + descriptor and continue the HS connection. Fixes bug 28970; bugfix on + 0.3.2.1-alpha. diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index 2a5765aec..fd2d26645 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -672,8 +672,12 @@ setup_intro_circ_auth_key(origin_circuit_t *circ) tor_assert(circ); desc = hs_cache_lookup_as_client(&circ->hs_ident->identity_pk); - if (BUG(desc == NULL)) { - /* Opening intro circuit without the descriptor is no good... */ + if (desc == NULL) { + /* There is a very small race window between the opening of this circuit + * and the client descriptor cache that gets purged (NEWNYM) or the + * cleaned up because it expired. Mark the circuit for close so a new + * descriptor fetch can occur. */ + circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_INTERNAL); goto end; }

1 0