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

[tor/release-0.3.4] test/sr: Clear SRVs after init, and before setup
by teor＠torproject.org 19 Mar '19

19 Mar '19

commit c44ad396f89e755f5a639b382e0a55ed1cbcc177 Author: teor <teor(a)torproject.org> Date: Mon Mar 18 11:12:25 2019 +1000 test/sr: Clear SRVs after init, and before setup Already merged to 0.4.0 and later in tor-github/pr/776. Backported to 0.2.9 and later with minor comment changes. Part of 29706. --- src/test/test_shared_random.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c index 0a3c2e119..526fb09b6 100644 --- a/src/test/test_shared_random.c +++ b/src/test/test_shared_random.c @@ -54,6 +54,9 @@ init_authority_state(void) * the phase we are currently in which uses "now" as the starting * timestamp. Delete it before we do any testing below. */ sr_state_delete_commits(); + /* It's also possible that a current SRV has been generated, if we are at + * state transition time. But let's just forget about that SRV. */ + sr_state_clean_srvs(); done: UNMOCK(get_my_v3_authority_cert); @@ -449,20 +452,26 @@ test_encoding(void *arg) ; } -/** Setup some SRVs in our SR state. If also_current is set, then set - * both current and previous SRVs. - * Helper of test_vote() and test_sr_compute_srv(). */ +/** Setup some SRVs in our SR state. + * If also_current is set, then set both current and previous SRVs. + * Otherwise, just set the previous SRV. (And clear the current SRV.) + * + * You must call sr_state_free() to free the state at the end of each test + * function (on pass or fail). */ static void test_sr_setup_srv(int also_current) { + /* Clear both SRVs before starting. + * In 0.3.5 and earlier, sr_state_set_previous_srv() and + * sr_state_set_current_srv() do not free() the old srvs. */ + sr_state_clean_srvs(); + sr_srv_t *srv = tor_malloc_zero(sizeof(sr_srv_t)); srv->num_reveals = 42; memcpy(srv->value, "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ", sizeof(srv->value)); - /* sr_state_set_previous_srv() does not free() the old previous srv. */ - state_del_previous_srv(); sr_state_set_previous_srv(srv); if (also_current) { @@ -472,8 +481,6 @@ test_sr_setup_srv(int also_current) "NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN", sizeof(srv->value)); - /* sr_state_set_previous_srv() does not free() the old current srv. */ - state_del_current_srv(); sr_state_set_current_srv(srv); } }

1 0

[tor/release-0.3.4] Merge remote-tracking branch 'tor-github/pr/774' into maint-0.2.9
by teor＠torproject.org 19 Mar '19

19 Mar '19

commit db2ac3b9fe7768e99e1a5d16d1bb4e76776ae72a Merge: 8bd9b2a6a c44ad396f Author: teor <teor(a)torproject.org> Date: Wed Mar 20 09:46:10 2019 +1000 Merge remote-tracking branch 'tor-github/pr/774' into maint-0.2.9 changes/bug29706_minimal | 4 ++++ src/or/shared_random_state.c | 4 ++-- src/or/shared_random_state.h | 2 ++ src/test/test_shared_random.c | 17 ++++++++++++++--- 4 files changed, 22 insertions(+), 5 deletions(-)

1 0

[tor/release-0.3.4] Merge branch 'bug29706_029_minimal' into bug29706_034_minimal_merge
by teor＠torproject.org 19 Mar '19

19 Mar '19

commit 1d0146e2a23180d6c3764fd51a29f84a4127d58e Merge: e021f89f3 c44ad396f Author: teor <teor(a)torproject.org> Date: Mon Mar 18 11:27:59 2019 +1000 Merge branch 'bug29706_029_minimal' into bug29706_034_minimal_merge changes/bug29706_minimal | 4 ++++ src/or/dirauth/shared_random_state.c | 4 ++-- src/or/dirauth/shared_random_state.h | 2 ++ src/test/test_shared_random.c | 17 ++++++++++++++--- 4 files changed, 22 insertions(+), 5 deletions(-) diff --cc src/or/dirauth/shared_random_state.h index 60a326f86,cf027f2d3..d31983d18 --- a/src/or/dirauth/shared_random_state.h +++ b/src/or/dirauth/shared_random_state.h @@@ -140,8 -140,10 +140,10 @@@ STATIC int is_phase_transition(sr_phase STATIC void set_sr_phase(sr_phase_t phase); STATIC sr_state_t *get_sr_state(void); + STATIC void state_del_previous_srv(void); + STATIC void state_del_current_srv(void); -#endif /* TOR_UNIT_TESTS */ +#endif /* defined(TOR_UNIT_TESTS) */ -#endif /* TOR_SHARED_RANDOM_STATE_H */ +#endif /* !defined(TOR_SHARED_RANDOM_STATE_H) */

1 0

[tor/release-0.3.4] test/sr: update sr_state_free() to sr_state_free_all() in a comment
by teor＠torproject.org 19 Mar '19

19 Mar '19

commit aec6ee201bbf63f54bcf879de10addf00779504c Author: teor <teor(a)torproject.org> Date: Mon Mar 18 11:28:34 2019 +1000 test/sr: update sr_state_free() to sr_state_free_all() in a comment --- src/test/test_shared_random.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c index 2d07eb219..630883e1f 100644 --- a/src/test/test_shared_random.c +++ b/src/test/test_shared_random.c @@ -551,7 +551,7 @@ test_encoding(void *arg) * If also_current is set, then set both current and previous SRVs. * Otherwise, just set the previous SRV. (And clear the current SRV.) * - * You must call sr_state_free() to free the state at the end of each test + * You must call sr_state_free_all() to free the state at the end of each test * function (on pass or fail). */ static void test_sr_setup_srv(int also_current)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by teor＠torproject.org 19 Mar '19

19 Mar '19

commit 1e154d7a156de68f41a52c067ba47fd38ce2a520 Merge: 547ee1c34 d7a5fdcb7 Author: teor <teor(a)torproject.org> Date: Wed Mar 20 09:47:59 2019 +1000 Merge branch 'maint-0.3.4' into release-0.3.4 changes/bug29706_minimal | 4 ++++ src/or/dirauth/shared_random_state.c | 4 ++-- src/or/dirauth/shared_random_state.h | 2 ++ src/test/test_shared_random.c | 17 ++++++++++++++--- 4 files changed, 22 insertions(+), 5 deletions(-)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.4
by teor＠torproject.org 19 Mar '19

19 Mar '19

commit d7a5fdcb7408536008e8142becc323148e901da5 Merge: aec6ee201 db2ac3b9f Author: teor <teor(a)torproject.org> Date: Wed Mar 20 09:47:55 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.4

1 0

[tor/release-0.3.5] test/sr: Free SRVs before replacing them in test_sr_setup_srv()
by teor＠torproject.org 19 Mar '19

19 Mar '19

commit 9400da9b5e44bfce0684a3b36edb37465be514d6 Author: teor <teor(a)torproject.org> Date: Sat Mar 9 10:50:07 2019 +1000 test/sr: Free SRVs before replacing them in test_sr_setup_srv() Stop leaking parts of the shared random state in the shared-random unit tests. The previous fix in 29599 was incomplete. Fixes bug 29706; bugfix on 0.2.9.1-alpha. --- changes/bug29706_minimal | 4 ++++ src/or/shared_random_state.c | 4 ++-- src/or/shared_random_state.h | 2 ++ src/test/test_shared_random.c | 4 ++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/changes/bug29706_minimal b/changes/bug29706_minimal new file mode 100644 index 000000000..9d4a43326 --- /dev/null +++ b/changes/bug29706_minimal @@ -0,0 +1,4 @@ + o Minor bugfixes (memory management, testing): + - Stop leaking parts of the shared random state in the shared-random unit + tests. The previous fix in 29599 was incomplete. + Fixes bug 29706; bugfix on 0.2.9.1-alpha. diff --git a/src/or/shared_random_state.c b/src/or/shared_random_state.c index 8438d4640..f27eccafc 100644 --- a/src/or/shared_random_state.c +++ b/src/or/shared_random_state.c @@ -1007,7 +1007,7 @@ state_query(sr_state_action_t action, sr_state_object_t obj_type, /* Delete the current SRV value from the state freeing it and the value is set * to NULL meaning empty. */ -static void +STATIC void state_del_current_srv(void) { state_query(SR_STATE_ACTION_DEL, SR_STATE_OBJ_CURSRV, NULL, NULL); @@ -1015,7 +1015,7 @@ state_del_current_srv(void) /* Delete the previous SRV value from the state freeing it and the value is * set to NULL meaning empty. */ -static void +STATIC void state_del_previous_srv(void) { state_query(SR_STATE_ACTION_DEL, SR_STATE_OBJ_PREVSRV, NULL, NULL); diff --git a/src/or/shared_random_state.h b/src/or/shared_random_state.h index 43a7f1d28..cf027f2d3 100644 --- a/src/or/shared_random_state.h +++ b/src/or/shared_random_state.h @@ -140,6 +140,8 @@ STATIC int is_phase_transition(sr_phase_t next_phase); STATIC void set_sr_phase(sr_phase_t phase); STATIC sr_state_t *get_sr_state(void); +STATIC void state_del_previous_srv(void); +STATIC void state_del_current_srv(void); #endif /* TOR_UNIT_TESTS */ diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c index cebe772d9..0a3c2e119 100644 --- a/src/test/test_shared_random.c +++ b/src/test/test_shared_random.c @@ -461,6 +461,8 @@ test_sr_setup_srv(int also_current) "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ", sizeof(srv->value)); + /* sr_state_set_previous_srv() does not free() the old previous srv. */ + state_del_previous_srv(); sr_state_set_previous_srv(srv); if (also_current) { @@ -470,6 +472,8 @@ test_sr_setup_srv(int also_current) "NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN", sizeof(srv->value)); + /* sr_state_set_previous_srv() does not free() the old current srv. */ + state_del_current_srv(); sr_state_set_current_srv(srv); } }

1 0

[tor/release-0.3.5] Stop logging a BUG() warning when tor is waiting for exit descriptors
by teor＠torproject.org 19 Mar '19

19 Mar '19

commit 532f4c9103315bff1de21b3e0eeeee6fcf790647 Author: teor <teor(a)torproject.org> Date: Tue Mar 5 12:53:14 2019 +1000 Stop logging a BUG() warning when tor is waiting for exit descriptors Fixes bug 28656; bugfix on 0.3.5.1-alpha. --- changes/bug28656 | 3 +++ src/feature/nodelist/nodelist.c | 16 +++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/changes/bug28656 b/changes/bug28656 new file mode 100644 index 000000000..d3a13d196 --- /dev/null +++ b/changes/bug28656 @@ -0,0 +1,3 @@ + o Minor bugfixes (logging): + - Stop logging a BUG() warning when tor is waiting for exit descriptors. + Fixes bug 28656; bugfix on 0.3.5.1-alpha. diff --git a/src/feature/nodelist/nodelist.c b/src/feature/nodelist/nodelist.c index 935ac7840..99d7f746a 100644 --- a/src/feature/nodelist/nodelist.c +++ b/src/feature/nodelist/nodelist.c @@ -2449,12 +2449,18 @@ compute_frac_paths_available(const networkstatus_t *consensus, f_exit = f_myexit; } - /* if the consensus has no exits, we can only build onion service paths, - * which are G - M - M. So use the middle fraction for the exit fraction. */ + /* If the consensus has no exits that pass flag, descriptor, and policy + * checks, we can only build onion service paths, which are G - M - M. */ if (router_have_consensus_path() != CONSENSUS_PATH_EXIT) { - /* If there are no exits in the consensus, then f_exit is always 0, so - * it is safe to replace f_exit with f_mid. */ - if (!BUG(f_exit > 0.0)) { + /* If the exit bandwidth weight fraction is not zero, we need to wait for + * descriptors for those exits. (The bandwidth weight fraction does not + * check for descriptors.) + * If the exit bandwidth fraction is zero, there are no exits in the + * consensus at all. So it is safe to replace f_exit with f_mid. + * + * f_exit is non-negative, but some compilers complain about float and == + */ + if (f_exit <= 0.0) { f_exit = f_mid; } }

1 0

[tor/release-0.3.5] Merge branch 'bug29706_029_minimal' into bug29706_034_minimal_merge
by teor＠torproject.org 19 Mar '19

19 Mar '19

commit 1d0146e2a23180d6c3764fd51a29f84a4127d58e Merge: e021f89f3 c44ad396f Author: teor <teor(a)torproject.org> Date: Mon Mar 18 11:27:59 2019 +1000 Merge branch 'bug29706_029_minimal' into bug29706_034_minimal_merge changes/bug29706_minimal | 4 ++++ src/or/dirauth/shared_random_state.c | 4 ++-- src/or/dirauth/shared_random_state.h | 2 ++ src/test/test_shared_random.c | 17 ++++++++++++++--- 4 files changed, 22 insertions(+), 5 deletions(-) diff --cc src/or/dirauth/shared_random_state.h index 60a326f86,cf027f2d3..d31983d18 --- a/src/or/dirauth/shared_random_state.h +++ b/src/or/dirauth/shared_random_state.h @@@ -140,8 -140,10 +140,10 @@@ STATIC int is_phase_transition(sr_phase STATIC void set_sr_phase(sr_phase_t phase); STATIC sr_state_t *get_sr_state(void); + STATIC void state_del_previous_srv(void); + STATIC void state_del_current_srv(void); -#endif /* TOR_UNIT_TESTS */ +#endif /* defined(TOR_UNIT_TESTS) */ -#endif /* TOR_SHARED_RANDOM_STATE_H */ +#endif /* !defined(TOR_SHARED_RANDOM_STATE_H) */

1 0

[tor/release-0.3.5] test/sr: Clear SRVs after init, and before setup
by teor＠torproject.org 19 Mar '19

19 Mar '19

commit c44ad396f89e755f5a639b382e0a55ed1cbcc177 Author: teor <teor(a)torproject.org> Date: Mon Mar 18 11:12:25 2019 +1000 test/sr: Clear SRVs after init, and before setup Already merged to 0.4.0 and later in tor-github/pr/776. Backported to 0.2.9 and later with minor comment changes. Part of 29706. --- src/test/test_shared_random.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c index 0a3c2e119..526fb09b6 100644 --- a/src/test/test_shared_random.c +++ b/src/test/test_shared_random.c @@ -54,6 +54,9 @@ init_authority_state(void) * the phase we are currently in which uses "now" as the starting * timestamp. Delete it before we do any testing below. */ sr_state_delete_commits(); + /* It's also possible that a current SRV has been generated, if we are at + * state transition time. But let's just forget about that SRV. */ + sr_state_clean_srvs(); done: UNMOCK(get_my_v3_authority_cert); @@ -449,20 +452,26 @@ test_encoding(void *arg) ; } -/** Setup some SRVs in our SR state. If also_current is set, then set - * both current and previous SRVs. - * Helper of test_vote() and test_sr_compute_srv(). */ +/** Setup some SRVs in our SR state. + * If also_current is set, then set both current and previous SRVs. + * Otherwise, just set the previous SRV. (And clear the current SRV.) + * + * You must call sr_state_free() to free the state at the end of each test + * function (on pass or fail). */ static void test_sr_setup_srv(int also_current) { + /* Clear both SRVs before starting. + * In 0.3.5 and earlier, sr_state_set_previous_srv() and + * sr_state_set_current_srv() do not free() the old srvs. */ + sr_state_clean_srvs(); + sr_srv_t *srv = tor_malloc_zero(sizeof(sr_srv_t)); srv->num_reveals = 42; memcpy(srv->value, "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ", sizeof(srv->value)); - /* sr_state_set_previous_srv() does not free() the old previous srv. */ - state_del_previous_srv(); sr_state_set_previous_srv(srv); if (also_current) { @@ -472,8 +481,6 @@ test_sr_setup_srv(int also_current) "NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN", sizeof(srv->value)); - /* sr_state_set_previous_srv() does not free() the old current srv. */ - state_del_current_srv(); sr_state_set_current_srv(srv); } }

1 0