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

[tor/maint-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

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

25 Nov '19

commit 54c01119ed59668bfa8ed6ef978201731bef0554 Merge: 83424cb62 841cff6e4 Author: teor <teor(a)torproject.org> Date: Mon Nov 25 12:33:55 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1405' into maint-0.3.5 changes/bug30344 | 4 ++++ src/core/mainloop/connection.c | 18 ++++++++++++------ src/core/mainloop/mainloop.c | 10 ++++++++++ 3 files changed, 26 insertions(+), 6 deletions(-)

1 0

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

25 Nov '19

commit f9812ee5f7336bac9caaf57946e46cd19dfaf0be Merge: 7beaaed24 ff304f3be Author: teor <teor(a)torproject.org> Date: Mon Nov 25 12:29:43 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1394' into maint-0.3.5 changes/bug31939 | 3 +++ src/lib/tls/buffers_tls.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

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

25 Nov '19

commit 400cee261ecccd024f6cb13dd1a940d4b9d0057b Merge: 54c01119e 4a8d49132 Author: teor <teor(a)torproject.org> Date: Mon Nov 25 12:34:29 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1422' into maint-0.3.5 changes/ticket32058 | 5 +++++ src/core/mainloop/periodic.c | 5 +++++ 2 files changed, 10 insertions(+)

1 0

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

25 Nov '19

commit 83424cb62f19ee09cba769a6c9a8cc94fc3c4cb7 Merge: f9812ee5f 984a28f3e Author: teor <teor(a)torproject.org> Date: Mon Nov 25 12:33:14 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1395' into maint-0.3.5 changes/ticket31548 | 7 +++++++ src/feature/hs/hs_service.c | 9 +++++++++ 2 files changed, 16 insertions(+)

1 0

[tor/maint-0.3.5] 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/master] CodingStandards: Use the correct changes file format
by teor＠torproject.org 25 Nov '19

25 Nov '19

commit 969ee5d77fa749be86ef7a9f304faf27fb6ddaa8 Author: teor <teor(a)torproject.org> Date: Mon Nov 25 11:42:40 2019 +1000 CodingStandards: Use the correct changes file format And remove a duplicate description of the format. Obviously correct changes to documentation. --- doc/HACKING/CodingStandards.md | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/doc/HACKING/CodingStandards.md b/doc/HACKING/CodingStandards.md index 74db2a39a..e483dd74b 100644 --- a/doc/HACKING/CodingStandards.md +++ b/doc/HACKING/CodingStandards.md @@ -99,17 +99,28 @@ When you do a commit that needs a ChangeLog entry, add a new file to the `changes` toplevel subdirectory. It should have the format of a one-entry changelog section from the current ChangeLog file, as in -- Major bugfixes: + o Major bugfixes (security): - Fix a potential buffer overflow. Fixes bug 99999; bugfix on 0.3.1.4-beta. + o Minor features (performance): + - Make tor faster. Closes ticket 88888. To write a changes file, first categorize the change. Some common categories -are: Minor bugfixes, Major bugfixes, Minor features, Major features, Code -simplifications and refactoring. Then say what the change does. If -it's a bugfix, mention what bug it fixes and when the bug was -introduced. To find out which Git tag the change was introduced in, -you can use `git describe --contains <sha1 of commit>`. - +are: + o Minor bugfixes (subheading): + o Major bugfixes (subheading): + o Minor features (subheading): + o Major features (subheading): + o Code simplifications and refactoring: + o Testing: + o Documentation: + +The subheading is a particular area within Tor. See the ChangeLog for +examples. + +Then say what the change does. If it's a bugfix, mention what bug it fixes +and when the bug was introduced. To find out which Git tag the change was +introduced in, you can use `git describe --contains <sha1 of commit>`. If you don't know the commit, you can search the git diffs (-S) for the first instance of the feature (--reverse). @@ -147,10 +158,6 @@ that our CI passes. These checks are implemented in `scripts/maint/lintChanges.py`. Changes file style guide: - * Changes files begin with " o Header (subheading):". The header - should usually be "Minor/Major bugfixes/features". The subheading is a - particular area within Tor. See the ChangeLog for examples. - * Make everything terse. * Write from the user's point of view: describe the user-visible changes

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1557'
by teor＠torproject.org 25 Nov '19

25 Nov '19

commit e6ceded7d8f241d08bc4e7eb8321b83e055e020a Merge: d9d75d4ae ff7d0ebcf Author: teor <teor(a)torproject.org> Date: Mon Nov 25 12:24:22 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1557' src/app/config/config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

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

25 Nov '19

commit 83424cb62f19ee09cba769a6c9a8cc94fc3c4cb7 Merge: f9812ee5f 984a28f3e Author: teor <teor(a)torproject.org> Date: Mon Nov 25 12:33:14 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1395' into maint-0.3.5 changes/ticket31548 | 7 +++++++ src/feature/hs/hs_service.c | 9 +++++++++ 2 files changed, 16 insertions(+)

1 0

[tor/master] Fix a low-impact memory leak in options_act_reversible()
by teor＠torproject.org 25 Nov '19

25 Nov '19

commit ff7d0ebcfe54223e092bfb8c4f9e6b11c5ef6627 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 22 09:04:36 2019 -0500 Fix a low-impact memory leak in options_act_reversible() Found by Coverity as CID 1455953 Fixes bug 32575; bug not in any released Tor. --- src/app/config/config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index e61281dac..34f20c31c 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -1945,7 +1945,7 @@ options_act_reversible,(const or_options_t *old_options, char **msg)) if (first_time) { if (options_switch_id(msg) < 0) - goto done; + goto rollback; } /* On the other hand, we need to touch the file system _after_ we @@ -1954,7 +1954,7 @@ options_act_reversible,(const or_options_t *old_options, char **msg)) */ if (first_time) { if (options_create_directories(msg) < 0) - goto done; + goto rollback; } /* Bail out at this point if we're not going to be a client or server:

1 0