April 2018 - tor-commits - lists.torproject.org

[tor/maint-0.3.1] Fix another crash-on-no-threadpool bug.
by nickm＠torproject.org 24 Apr '18

24 Apr '18

commit 386f8016b7373bec346162705671751f07f281d7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 10 14:44:38 2018 -0400 Fix another crash-on-no-threadpool bug. This one happens if for some reason you start with DirPort enabled but server mode turned off entirely. Fixes a case of bug 23693; bugfix on 0.3.1.1-alpha. --- changes/bug23693.1 | 4 ++++ src/or/config.c | 10 +++++++++- src/or/main.c | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/changes/bug23693.1 b/changes/bug23693.1 new file mode 100644 index 000000000..4b1678881 --- /dev/null +++ b/changes/bug23693.1 @@ -0,0 +1,4 @@ + o Minor bugfixes (relay, crash): + - Avoid a crash when running with DirPort set but ORPort tuned off. + Fixes a case of bug 23693; bugfix on 0.3.1.1-alpha. + diff --git a/src/or/config.c b/src/or/config.c index 156ffc9df..cac4ce812 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1941,9 +1941,16 @@ options_act(const or_options_t *old_options) if (transition_affects_workers) { log_info(LD_GENERAL, "Worker-related options changed. Rotating workers."); + const int server_mode_turned_on = + server_mode(options) && !server_mode(old_options); + const int dir_server_mode_turned_on = + dir_server_mode(options) && !dir_server_mode(old_options); - if (server_mode(options) && !server_mode(old_options)) { + if (server_mode_turned_on || dir_server_mode_turned_on) { cpu_init(); + } + + if (server_mode_turned_on) { ip_address_changed(0); if (have_completed_a_circuit() || !any_predicted_circuits(time(NULL))) inform_testing_reachability(); @@ -4494,6 +4501,7 @@ options_transition_affects_workers(const or_options_t *old_options, old_options->SafeLogging_ != new_options->SafeLogging_ || old_options->ClientOnly != new_options->ClientOnly || server_mode(old_options) != server_mode(new_options) || + dir_server_mode(old_options) != dir_server_mode(new_options) || public_server_mode(old_options) != public_server_mode(new_options) || !config_lines_eq(old_options->Logs, new_options->Logs) || old_options->LogMessageDomains != new_options->LogMessageDomains) diff --git a/src/or/main.c b/src/or/main.c index 197dfd430..e9723cb0b 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2487,7 +2487,7 @@ do_main_loop(void) now = time(NULL); directory_info_has_arrived(now, 1, 0); - if (server_mode(get_options())) { + if (server_mode(get_options()) || dir_server_mode(get_options())) { /* launch cpuworkers. Need to do this *after* we've read the onion key. */ cpu_init(); }

1 0

[tor/maint-0.3.1] Allow cpuworkers to exist without onion keys
by nickm＠torproject.org 24 Apr '18

24 Apr '18

commit c3e40a83618c91fe7ef004577b0cb140ac83e3d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Apr 22 17:12:18 2018 -0400 Allow cpuworkers to exist without onion keys Now that we allow cpuworkers for dirport-only hosts (to fix 23693), we need to allow dup_onion_keys() to succeed for them. The change to construct_ntor_key_map() is for correctness, but is not strictly necessary. --- src/or/router.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index 55b58e5d1..f29ebbdf8 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -131,7 +131,8 @@ get_onion_key(void) } /** Store a full copy of the current onion key into *key, and a full - * copy of the most recent onion key into *last. + * copy of the most recent onion key into *last. Store NULL into + * a pointer if the corresponding key does not exist. */ void dup_onion_keys(crypto_pk_t **key, crypto_pk_t **last) @@ -139,8 +140,10 @@ dup_onion_keys(crypto_pk_t **key, crypto_pk_t **last) tor_assert(key); tor_assert(last); tor_mutex_acquire(key_lock); - tor_assert(onionkey); - *key = crypto_pk_copy_full(onionkey); + if (onionkey) + *key = crypto_pk_copy_full(onionkey); + else + *last = NULL; if (lastonionkey) *last = crypto_pk_copy_full(lastonionkey); else @@ -207,10 +210,14 @@ construct_ntor_key_map(void) { di_digest256_map_t *m = NULL; - dimap_add_entry(&m, - curve25519_onion_key.pubkey.public_key, - tor_memdup(&curve25519_onion_key, - sizeof(curve25519_keypair_t))); + if (!tor_mem_is_zero((const char*) + curve25519_onion_key.pubkey.public_key, + CURVE25519_PUBKEY_LEN)) { + dimap_add_entry(&m, + curve25519_onion_key.pubkey.public_key, + tor_memdup(&curve25519_onion_key, + sizeof(curve25519_keypair_t))); + } if (!tor_mem_is_zero((const char*) last_curve25519_onion_key.pubkey.public_key, CURVE25519_PUBKEY_LEN)) {

1 0

[tor/maint-0.3.1] Merge remote-tracking branch 'public/bug23693_031_redux' into maint-0.3.1
by nickm＠torproject.org 24 Apr '18

24 Apr '18

commit e8886340762cbe3be306268dfe0003214b09ac07 Merge: 5c3639923 c3e40a836 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 24 08:49:20 2018 -0400 Merge remote-tracking branch 'public/bug23693_031_redux' into maint-0.3.1 changes/bug23693.1 | 4 ++++ src/or/config.c | 10 +++++++++- src/or/main.c | 2 +- src/or/router.c | 21 ++++++++++++++------- 4 files changed, 28 insertions(+), 9 deletions(-)

1 0

[tor/maint-0.3.2] Merge remote-tracking branch 'public/bug23693_031_redux' into maint-0.3.1
by nickm＠torproject.org 24 Apr '18

24 Apr '18

commit e8886340762cbe3be306268dfe0003214b09ac07 Merge: 5c3639923 c3e40a836 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 24 08:49:20 2018 -0400 Merge remote-tracking branch 'public/bug23693_031_redux' into maint-0.3.1 changes/bug23693.1 | 4 ++++ src/or/config.c | 10 +++++++++- src/or/main.c | 2 +- src/or/router.c | 21 ++++++++++++++------- 4 files changed, 28 insertions(+), 9 deletions(-)

1 0

[tor/maint-0.3.2] Allow cpuworkers to exist without onion keys
by nickm＠torproject.org 24 Apr '18

24 Apr '18

commit c3e40a83618c91fe7ef004577b0cb140ac83e3d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Apr 22 17:12:18 2018 -0400 Allow cpuworkers to exist without onion keys Now that we allow cpuworkers for dirport-only hosts (to fix 23693), we need to allow dup_onion_keys() to succeed for them. The change to construct_ntor_key_map() is for correctness, but is not strictly necessary. --- src/or/router.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index 55b58e5d1..f29ebbdf8 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -131,7 +131,8 @@ get_onion_key(void) } /** Store a full copy of the current onion key into *key, and a full - * copy of the most recent onion key into *last. + * copy of the most recent onion key into *last. Store NULL into + * a pointer if the corresponding key does not exist. */ void dup_onion_keys(crypto_pk_t **key, crypto_pk_t **last) @@ -139,8 +140,10 @@ dup_onion_keys(crypto_pk_t **key, crypto_pk_t **last) tor_assert(key); tor_assert(last); tor_mutex_acquire(key_lock); - tor_assert(onionkey); - *key = crypto_pk_copy_full(onionkey); + if (onionkey) + *key = crypto_pk_copy_full(onionkey); + else + *last = NULL; if (lastonionkey) *last = crypto_pk_copy_full(lastonionkey); else @@ -207,10 +210,14 @@ construct_ntor_key_map(void) { di_digest256_map_t *m = NULL; - dimap_add_entry(&m, - curve25519_onion_key.pubkey.public_key, - tor_memdup(&curve25519_onion_key, - sizeof(curve25519_keypair_t))); + if (!tor_mem_is_zero((const char*) + curve25519_onion_key.pubkey.public_key, + CURVE25519_PUBKEY_LEN)) { + dimap_add_entry(&m, + curve25519_onion_key.pubkey.public_key, + tor_memdup(&curve25519_onion_key, + sizeof(curve25519_keypair_t))); + } if (!tor_mem_is_zero((const char*) last_curve25519_onion_key.pubkey.public_key, CURVE25519_PUBKEY_LEN)) {

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 24 Apr '18

24 Apr '18

commit d2951b381bcbd45798b6cf8f01c5ce7a4d9ad4b9 Merge: 1438c6c71 e88863407 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 24 08:49:24 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug23693.1 | 4 ++++ src/or/config.c | 10 +++++++++- src/or/main.c | 2 +- src/or/router.c | 21 ++++++++++++++------- 4 files changed, 28 insertions(+), 9 deletions(-)

1 0

[tor/maint-0.3.2] Fix another crash-on-no-threadpool bug.
by nickm＠torproject.org 24 Apr '18

24 Apr '18

commit 386f8016b7373bec346162705671751f07f281d7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 10 14:44:38 2018 -0400 Fix another crash-on-no-threadpool bug. This one happens if for some reason you start with DirPort enabled but server mode turned off entirely. Fixes a case of bug 23693; bugfix on 0.3.1.1-alpha. --- changes/bug23693.1 | 4 ++++ src/or/config.c | 10 +++++++++- src/or/main.c | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/changes/bug23693.1 b/changes/bug23693.1 new file mode 100644 index 000000000..4b1678881 --- /dev/null +++ b/changes/bug23693.1 @@ -0,0 +1,4 @@ + o Minor bugfixes (relay, crash): + - Avoid a crash when running with DirPort set but ORPort tuned off. + Fixes a case of bug 23693; bugfix on 0.3.1.1-alpha. + diff --git a/src/or/config.c b/src/or/config.c index 156ffc9df..cac4ce812 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1941,9 +1941,16 @@ options_act(const or_options_t *old_options) if (transition_affects_workers) { log_info(LD_GENERAL, "Worker-related options changed. Rotating workers."); + const int server_mode_turned_on = + server_mode(options) && !server_mode(old_options); + const int dir_server_mode_turned_on = + dir_server_mode(options) && !dir_server_mode(old_options); - if (server_mode(options) && !server_mode(old_options)) { + if (server_mode_turned_on || dir_server_mode_turned_on) { cpu_init(); + } + + if (server_mode_turned_on) { ip_address_changed(0); if (have_completed_a_circuit() || !any_predicted_circuits(time(NULL))) inform_testing_reachability(); @@ -4494,6 +4501,7 @@ options_transition_affects_workers(const or_options_t *old_options, old_options->SafeLogging_ != new_options->SafeLogging_ || old_options->ClientOnly != new_options->ClientOnly || server_mode(old_options) != server_mode(new_options) || + dir_server_mode(old_options) != dir_server_mode(new_options) || public_server_mode(old_options) != public_server_mode(new_options) || !config_lines_eq(old_options->Logs, new_options->Logs) || old_options->LogMessageDomains != new_options->LogMessageDomains) diff --git a/src/or/main.c b/src/or/main.c index 197dfd430..e9723cb0b 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2487,7 +2487,7 @@ do_main_loop(void) now = time(NULL); directory_info_has_arrived(now, 1, 0); - if (server_mode(get_options())) { + if (server_mode(get_options()) || dir_server_mode(get_options())) { /* launch cpuworkers. Need to do this *after* we've read the onion key. */ cpu_init(); }

1 0

[tor/maint-0.3.3] Allow cpuworkers to exist without onion keys
by nickm＠torproject.org 24 Apr '18

24 Apr '18

commit c3e40a83618c91fe7ef004577b0cb140ac83e3d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Apr 22 17:12:18 2018 -0400 Allow cpuworkers to exist without onion keys Now that we allow cpuworkers for dirport-only hosts (to fix 23693), we need to allow dup_onion_keys() to succeed for them. The change to construct_ntor_key_map() is for correctness, but is not strictly necessary. --- src/or/router.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index 55b58e5d1..f29ebbdf8 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -131,7 +131,8 @@ get_onion_key(void) } /** Store a full copy of the current onion key into *key, and a full - * copy of the most recent onion key into *last. + * copy of the most recent onion key into *last. Store NULL into + * a pointer if the corresponding key does not exist. */ void dup_onion_keys(crypto_pk_t **key, crypto_pk_t **last) @@ -139,8 +140,10 @@ dup_onion_keys(crypto_pk_t **key, crypto_pk_t **last) tor_assert(key); tor_assert(last); tor_mutex_acquire(key_lock); - tor_assert(onionkey); - *key = crypto_pk_copy_full(onionkey); + if (onionkey) + *key = crypto_pk_copy_full(onionkey); + else + *last = NULL; if (lastonionkey) *last = crypto_pk_copy_full(lastonionkey); else @@ -207,10 +210,14 @@ construct_ntor_key_map(void) { di_digest256_map_t *m = NULL; - dimap_add_entry(&m, - curve25519_onion_key.pubkey.public_key, - tor_memdup(&curve25519_onion_key, - sizeof(curve25519_keypair_t))); + if (!tor_mem_is_zero((const char*) + curve25519_onion_key.pubkey.public_key, + CURVE25519_PUBKEY_LEN)) { + dimap_add_entry(&m, + curve25519_onion_key.pubkey.public_key, + tor_memdup(&curve25519_onion_key, + sizeof(curve25519_keypair_t))); + } if (!tor_mem_is_zero((const char*) last_curve25519_onion_key.pubkey.public_key, CURVE25519_PUBKEY_LEN)) {

1 0

[tor/maint-0.3.3] Fix another crash-on-no-threadpool bug.
by nickm＠torproject.org 24 Apr '18

24 Apr '18

commit 386f8016b7373bec346162705671751f07f281d7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 10 14:44:38 2018 -0400 Fix another crash-on-no-threadpool bug. This one happens if for some reason you start with DirPort enabled but server mode turned off entirely. Fixes a case of bug 23693; bugfix on 0.3.1.1-alpha. --- changes/bug23693.1 | 4 ++++ src/or/config.c | 10 +++++++++- src/or/main.c | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/changes/bug23693.1 b/changes/bug23693.1 new file mode 100644 index 000000000..4b1678881 --- /dev/null +++ b/changes/bug23693.1 @@ -0,0 +1,4 @@ + o Minor bugfixes (relay, crash): + - Avoid a crash when running with DirPort set but ORPort tuned off. + Fixes a case of bug 23693; bugfix on 0.3.1.1-alpha. + diff --git a/src/or/config.c b/src/or/config.c index 156ffc9df..cac4ce812 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1941,9 +1941,16 @@ options_act(const or_options_t *old_options) if (transition_affects_workers) { log_info(LD_GENERAL, "Worker-related options changed. Rotating workers."); + const int server_mode_turned_on = + server_mode(options) && !server_mode(old_options); + const int dir_server_mode_turned_on = + dir_server_mode(options) && !dir_server_mode(old_options); - if (server_mode(options) && !server_mode(old_options)) { + if (server_mode_turned_on || dir_server_mode_turned_on) { cpu_init(); + } + + if (server_mode_turned_on) { ip_address_changed(0); if (have_completed_a_circuit() || !any_predicted_circuits(time(NULL))) inform_testing_reachability(); @@ -4494,6 +4501,7 @@ options_transition_affects_workers(const or_options_t *old_options, old_options->SafeLogging_ != new_options->SafeLogging_ || old_options->ClientOnly != new_options->ClientOnly || server_mode(old_options) != server_mode(new_options) || + dir_server_mode(old_options) != dir_server_mode(new_options) || public_server_mode(old_options) != public_server_mode(new_options) || !config_lines_eq(old_options->Logs, new_options->Logs) || old_options->LogMessageDomains != new_options->LogMessageDomains) diff --git a/src/or/main.c b/src/or/main.c index 197dfd430..e9723cb0b 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2487,7 +2487,7 @@ do_main_loop(void) now = time(NULL); directory_info_has_arrived(now, 1, 0); - if (server_mode(get_options())) { + if (server_mode(get_options()) || dir_server_mode(get_options())) { /* launch cpuworkers. Need to do this *after* we've read the onion key. */ cpu_init(); }

1 0

[tor/maint-0.3.3] Merge remote-tracking branch 'public/bug23693_031_redux' into maint-0.3.1
by nickm＠torproject.org 24 Apr '18

24 Apr '18

commit e8886340762cbe3be306268dfe0003214b09ac07 Merge: 5c3639923 c3e40a836 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 24 08:49:20 2018 -0400 Merge remote-tracking branch 'public/bug23693_031_redux' into maint-0.3.1 changes/bug23693.1 | 4 ++++ src/or/config.c | 10 +++++++++- src/or/main.c | 2 +- src/or/router.c | 21 ++++++++++++++------- 4 files changed, 28 insertions(+), 9 deletions(-)

1 0