December 2017 - tor-commits - lists.torproject.org

[tor/maint-0.3.2] Update entry guard state whenever we download a consensus.
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit 210f0c24f039aa6d46b9396ec6bb13ff575a9e79 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Oct 25 19:18:25 2017 +0300 Update entry guard state whenever we download a consensus. Update guard state even if we don't have enough dirinfo since that actually affects the future download of dirinfos. Fixes #23862 on 0.3.0.1-alpha --- src/or/main.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index 478316b79..1d899349e 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -965,6 +965,15 @@ directory_info_has_arrived(time_t now, int from_cache, int suppress_logs) { const or_options_t *options = get_options(); + /* if we have enough dir info, then update our guard status with + * whatever we just learned. */ + int invalidate_circs = guards_update_all(); + + if (invalidate_circs) { + circuit_mark_all_unused_circs(); + circuit_mark_all_dirty_circs_as_unusable(); + } + if (!router_have_minimum_dir_info()) { int quiet = suppress_logs || from_cache || directory_too_idle_to_fetch_descriptors(options, now); @@ -978,15 +987,6 @@ directory_info_has_arrived(time_t now, int from_cache, int suppress_logs) update_all_descriptor_downloads(now); } - /* if we have enough dir info, then update our guard status with - * whatever we just learned. */ - int invalidate_circs = guards_update_all(); - - if (invalidate_circs) { - circuit_mark_all_unused_circs(); - circuit_mark_all_dirty_circs_as_unusable(); - } - /* Don't even bother trying to get extrainfo until the rest of our * directory info is up-to-date */ if (options->DownloadExtraInfo)

1 0

[tor/maint-0.3.2] Merge remote-tracking branch 'asn/bug23862_030' into maint-0.3.0
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit c55a0542369d01f39472cc502c8e27ff85250dc6 Merge: 3bca705c5 7ae9e92ff Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:41:28 2017 -0500 Merge remote-tracking branch 'asn/bug23862_030' into maint-0.3.0 changes/bug23682 | 5 +++++ src/or/directory.c | 3 +-- src/or/main.c | 18 +++++++++--------- 3 files changed, 15 insertions(+), 11 deletions(-)

1 0

[tor/maint-0.3.2] Merge remote-tracking branch 'asn/bug23862_031' into maint-0.3.1
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit ae608408e93296dfe123c69fbd3dae02d50d9c66 Merge: 8e100d1a1 43c34dfca Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:43:41 2017 -0500 Merge remote-tracking branch 'asn/bug23862_031' into maint-0.3.1 changes/bug23682 | 5 +++++ src/or/directory.c | 4 ++-- src/or/main.c | 18 +++++++++--------- 3 files changed, 16 insertions(+), 11 deletions(-)

1 0

[tor/master] Remove a duplicate call to update_microdesc_downloads()
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit 6bd64e8212a29d21b20d68a3f69489ffdcbcb42b Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Oct 25 19:18:38 2017 +0300 Remove a duplicate call to update_microdesc_downloads() This call happens before we update our entry guards, so it needs to be removed for the fix to #23862 to work. --- src/or/directory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 9494cf02b..f54bf176c 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2592,11 +2592,11 @@ handle_response_fetch_consensus(dir_connection_t *conn, /* If we launched other fetches for this consensus, cancel them. */ connection_dir_close_consensus_fetches(conn, flavname); - /* launches router downloads as needed */ + /* update the list of routers and directory guards */ routers_update_all_from_networkstatus(now, 3); update_microdescs_from_networkstatus(now); - update_microdesc_downloads(now); directory_info_has_arrived(now, 0, 0); + if (authdir_mode_v3(get_options())) { sr_act_post_consensus( networkstatus_get_latest_consensus_by_flavor(FLAV_NS));

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit acc462c965acb90c2631797e10bb630eb2789e4e Merge: 418d8bbe9 ae608408e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:43:48 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug23682 | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[tor/master] Update entry guard state whenever we download a consensus.
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit 8276a0ab85bdea97180459277d9d5b4531e216c4 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Oct 25 19:18:25 2017 +0300 Update entry guard state whenever we download a consensus. Update guard state even if we don't have enough dirinfo since that actually affects the future download of dirinfos. Fixes #23862 on 0.3.0.1-alpha --- src/or/main.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index 7b1f4975f..0d91803d4 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -968,6 +968,15 @@ directory_info_has_arrived(time_t now, int from_cache, int suppress_logs) { const or_options_t *options = get_options(); + /* if we have enough dir info, then update our guard status with + * whatever we just learned. */ + int invalidate_circs = guards_update_all(); + + if (invalidate_circs) { + circuit_mark_all_unused_circs(); + circuit_mark_all_dirty_circs_as_unusable(); + } + if (!router_have_minimum_dir_info()) { int quiet = suppress_logs || from_cache || directory_too_idle_to_fetch_descriptors(options, now); @@ -981,15 +990,6 @@ directory_info_has_arrived(time_t now, int from_cache, int suppress_logs) update_all_descriptor_downloads(now); } - /* if we have enough dir info, then update our guard status with - * whatever we just learned. */ - int invalidate_circs = guards_update_all(); - - if (invalidate_circs) { - circuit_mark_all_unused_circs(); - circuit_mark_all_dirty_circs_as_unusable(); - } - /* Don't even bother trying to get extrainfo until the rest of our * directory info is up-to-date */ if (options->DownloadExtraInfo)

1 0

[tor/maint-0.3.2] transport_new() cannot fail; do not check for it to fail.
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit 472473ec5d1a49b852b2f20fd7b0ed3350877cd2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 26 17:05:30 2017 -0500 transport_new() cannot fail; do not check for it to fail. (It can't fail because the tor_malloc*() family of functions can never return NULL) Found with STACK. --- src/or/transports.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/or/transports.c b/src/or/transports.c index 68d135484..5fb24e11a 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -1094,8 +1094,6 @@ parse_smethod_line(const char *line, managed_proxy_t *mp) transport = transport_new(&tor_addr, port, method_name, PROXY_NONE, args_string); - if (!transport) - goto err; smartlist_add(mp->transports, transport); @@ -1186,8 +1184,6 @@ parse_cmethod_line(const char *line, managed_proxy_t *mp) } transport = transport_new(&tor_addr, port, method_name, socks_ver, NULL); - if (!transport) - goto err; smartlist_add(mp->transports, transport);

1 0

[tor/maint-0.3.2] Stop checking for sandbox:new_element() failures: it can't fail.
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit 3da15bcbe8992b0dc3350902248ee791d1054642 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 26 17:16:25 2017 -0500 Stop checking for sandbox:new_element() failures: it can't fail. (It can't fail because the tor_malloc*() family of functions can never return NULL) Found with STACK --- src/common/sandbox.c | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 0fd129d22..ba6c3efb9 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -1393,10 +1393,6 @@ sandbox_cfg_allow_stat_filename(sandbox_cfg_t **cfg, char *file) sandbox_cfg_t *elem = NULL; elem = new_element(SCMP_stat, file); - if (!elem) { - log_err(LD_BUG,"(Sandbox) failed to register parameter!"); - return -1; - } elem->next = *cfg; *cfg = elem; @@ -1410,10 +1406,6 @@ sandbox_cfg_allow_open_filename(sandbox_cfg_t **cfg, char *file) sandbox_cfg_t *elem = NULL; elem = new_element(SCMP_SYS(open), file); - if (!elem) { - log_err(LD_BUG,"(Sandbox) failed to register parameter!"); - return -1; - } elem->next = *cfg; *cfg = elem; @@ -1427,10 +1419,6 @@ sandbox_cfg_allow_chmod_filename(sandbox_cfg_t **cfg, char *file) sandbox_cfg_t *elem = NULL; elem = new_element(SCMP_SYS(chmod), file); - if (!elem) { - log_err(LD_BUG,"(Sandbox) failed to register parameter!"); - return -1; - } elem->next = *cfg; *cfg = elem; @@ -1444,10 +1432,6 @@ sandbox_cfg_allow_chown_filename(sandbox_cfg_t **cfg, char *file) sandbox_cfg_t *elem = NULL; elem = new_element(SCMP_SYS(chown), file); - if (!elem) { - log_err(LD_BUG,"(Sandbox) failed to register parameter!"); - return -1; - } elem->next = *cfg; *cfg = elem; @@ -1462,11 +1446,6 @@ sandbox_cfg_allow_rename(sandbox_cfg_t **cfg, char *file1, char *file2) elem = new_element2(SCMP_SYS(rename), file1, file2); - if (!elem) { - log_err(LD_BUG,"(Sandbox) failed to register parameter!"); - return -1; - } - elem->next = *cfg; *cfg = elem; @@ -1479,10 +1458,6 @@ sandbox_cfg_allow_openat_filename(sandbox_cfg_t **cfg, char *file) sandbox_cfg_t *elem = NULL; elem = new_element(SCMP_SYS(openat), file); - if (!elem) { - log_err(LD_BUG,"(Sandbox) failed to register parameter!"); - return -1; - } elem->next = *cfg; *cfg = elem;

1 0

[tor/maint-0.3.2] Merge branch 'stack_fixes_032_v2' into maint-0.3.2
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit 418d8bbe92bf31861ad2aaf787f00d20c7179c1e Merge: 057139d38 35d56a127 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:25:04 2017 -0500 Merge branch 'stack_fixes_032_v2' into maint-0.3.2 changes/stack | 7 +++++++ src/common/sandbox.c | 25 ------------------------- src/or/rephist.c | 4 +++- src/or/transports.c | 4 ---- 4 files changed, 10 insertions(+), 30 deletions(-)

1 0

[tor/maint-0.3.2] Add a changelog for the STACK fixes
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit 35d56a127d9af913f0f74ec359b182fa33f49c50 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 26 17:37:36 2017 -0500 Add a changelog for the STACK fixes --- changes/stack | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/changes/stack b/changes/stack new file mode 100644 index 000000000..ffdf536cb --- /dev/null +++ b/changes/stack @@ -0,0 +1,7 @@ + o Minor bugfixes (correctness): + - Fix several places in our codebase where a C compiler would be likely + to eliminate a check, based on assuming that undefined behavior had not + happened elsewhere in the code. These cases are usually a sign of + redundant checking, or dubious arithmetic. Found by Georg Koppen using + the "STACK" tool from Wang, Zeldovich, Kaashoek, and + Solar-Lezama. Fixes bug 24423; bugfix on various Tor versions.

1 0