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

[tor/master] hs tests: explicitly free 'service' variable.
by asn＠torproject.org 30 May '19

30 May '19

commit 0a9685b3a7437e8851f8cb65fea3d0a16b7833a7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 16 15:21:18 2019 -0400 hs tests: explicitly free 'service' variable. This should fix about 15 CID issues, where coverity can't tell that hs_free_all() frees the service we allocated. --- src/test/test_hs_common.c | 4 ++++ src/test/test_hs_service.c | 48 ++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 46 insertions(+), 6 deletions(-) diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c index bb41f1f87..abded6021 100644 --- a/src/test/test_hs_common.c +++ b/src/test/test_hs_common.c @@ -603,6 +603,10 @@ test_desc_reupload_logic(void *arg) SMARTLIST_FOREACH(ns->routerstatus_list, routerstatus_t *, rs, routerstatus_free(rs)); smartlist_clear(ns->routerstatus_list); + if (service) { + remove_service(get_hs_service_map(), service); + hs_service_free(service); + } networkstatus_vote_free(ns); cleanup_nodelist(); hs_free_all(); diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index c4a858369..a303f1041 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -878,6 +878,10 @@ test_helper_functions(void *arg) done: /* This will free the service and all objects associated to it. */ + if (service) { + remove_service(get_hs_service_map(), service); + hs_service_free(service); + } hs_service_free_all(); UNMOCK(node_get_by_id); } @@ -887,7 +891,7 @@ static void test_intro_circuit_opened(void *arg) { int flags = CIRCLAUNCH_NEED_UPTIME | CIRCLAUNCH_IS_INTERNAL; - hs_service_t *service; + hs_service_t *service = NULL; origin_circuit_t *circ = NULL; (void) arg; @@ -935,6 +939,10 @@ test_intro_circuit_opened(void *arg) done: circuit_free_(TO_CIRCUIT(circ)); + if (service) { + remove_service(get_hs_service_map(), service); + hs_service_free(service); + } hs_free_all(); UNMOCK(circuit_mark_for_close_); UNMOCK(relay_send_command_from_edge_); @@ -949,7 +957,7 @@ test_intro_established(void *arg) int flags = CIRCLAUNCH_NEED_UPTIME | CIRCLAUNCH_IS_INTERNAL; uint8_t payload[RELAY_PAYLOAD_SIZE] = {0}; origin_circuit_t *circ = NULL; - hs_service_t *service; + hs_service_t *service = NULL; hs_service_intro_point_t *ip = NULL; (void) arg; @@ -1010,6 +1018,10 @@ test_intro_established(void *arg) done: if (circ) circuit_free_(TO_CIRCUIT(circ)); + if (service) { + remove_service(get_hs_service_map(), service); + hs_service_free(service); + } hs_free_all(); UNMOCK(circuit_mark_for_close_); } @@ -1021,7 +1033,7 @@ test_rdv_circuit_opened(void *arg) { int flags = CIRCLAUNCH_NEED_UPTIME | CIRCLAUNCH_IS_INTERNAL; origin_circuit_t *circ = NULL; - hs_service_t *service; + hs_service_t *service = NULL; (void) arg; @@ -1052,6 +1064,10 @@ test_rdv_circuit_opened(void *arg) done: circuit_free_(TO_CIRCUIT(circ)); + if (service) { + remove_service(get_hs_service_map(), service); + hs_service_free(service); + } hs_free_all(); UNMOCK(circuit_mark_for_close_); UNMOCK(relay_send_command_from_edge_); @@ -1139,6 +1155,10 @@ test_closing_intro_circs(void *arg) circuit_free_(TO_CIRCUIT(intro_circ)); } /* Frees the service object. */ + if (service) { + remove_service(get_hs_service_map(), service); + hs_service_free(service); + } hs_free_all(); UNMOCK(assert_circuit_ok); } @@ -1151,7 +1171,7 @@ test_introduce2(void *arg) int flags = CIRCLAUNCH_NEED_UPTIME | CIRCLAUNCH_IS_INTERNAL; uint8_t payload[RELAY_PAYLOAD_SIZE] = {0}; origin_circuit_t *circ = NULL; - hs_service_t *service; + hs_service_t *service = NULL; hs_service_intro_point_t *ip = NULL; (void) arg; @@ -1218,6 +1238,10 @@ test_introduce2(void *arg) dummy_state = NULL; if (circ) circuit_free_(TO_CIRCUIT(circ)); + if (service) { + remove_service(get_hs_service_map(), service); + hs_service_free(service); + } hs_free_all(); UNMOCK(circuit_mark_for_close_); } @@ -1302,6 +1326,10 @@ test_service_event(void *arg) done: hs_circuitmap_remove_circuit(TO_CIRCUIT(circ)); circuit_free_(TO_CIRCUIT(circ)); + if (service) { + remove_service(get_hs_service_map(), service); + hs_service_free(service); + } hs_free_all(); UNMOCK(circuit_mark_for_close_); } @@ -1312,7 +1340,7 @@ test_rotate_descriptors(void *arg) { int ret; time_t next_rotation_time, now; - hs_service_t *service; + hs_service_t *service = NULL; hs_service_descriptor_t *desc_next; (void) arg; @@ -1404,6 +1432,10 @@ test_rotate_descriptors(void *arg) tt_assert(service->desc_next); done: + if (service) { + remove_service(get_hs_service_map(), service); + hs_service_free(service); + } hs_free_all(); UNMOCK(get_or_state); UNMOCK(circuit_mark_for_close_); @@ -1417,7 +1449,7 @@ test_build_update_descriptors(void *arg) { int ret; node_t *node; - hs_service_t *service; + hs_service_t *service = NULL; hs_service_intro_point_t *ip_cur, *ip_next; routerinfo_t ri; @@ -1634,6 +1666,10 @@ test_build_update_descriptors(void *arg) tt_u64_op(service->desc_next->next_upload_time, OP_EQ, 0); done: + if (service) { + remove_service(get_hs_service_map(), service); + hs_service_free(service); + } hs_free_all(); nodelist_free_all(); }

1 0

[tor/master] rng_test_helpers: add a needless lock/unlock pair to please coverity
by asn＠torproject.org 30 May '19

30 May '19

commit 1bf451cffba5da84166dda48ec957e0b9cf45bee Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 16 15:03:54 2019 -0400 rng_test_helpers: add a needless lock/unlock pair to please coverity Fix for CID 1444908 --- src/test/rng_test_helpers.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/test/rng_test_helpers.c b/src/test/rng_test_helpers.c index 262d380bd..04b713847 100644 --- a/src/test/rng_test_helpers.c +++ b/src/test/rng_test_helpers.c @@ -183,11 +183,14 @@ void testing_enable_prefilled_rng(const void *buffer, size_t buflen) { tor_assert(buflen > 0); + tor_assert(!rng_mutex); rng_mutex = tor_mutex_new(); + tor_mutex_acquire(rng_mutex); prefilled_rng_buffer = tor_memdup(buffer, buflen); prefilled_rng_buflen = buflen; prefilled_rng_idx = 0; + tor_mutex_release(rng_mutex); MOCK(crypto_rand, crypto_rand_prefilled); MOCK(crypto_strongest_rand_, mock_crypto_strongest_rand);

1 0

[tor/master] changes file for coverity fixes in tests (30150)
by asn＠torproject.org 30 May '19

30 May '19

commit 6246f4539ed317e05b773b0e373f1aa369d3759d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 16 15:38:08 2019 -0400 changes file for coverity fixes in tests (30150) --- changes/ticket30150 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/ticket30150 b/changes/ticket30150 new file mode 100644 index 000000000..70808fa5d --- /dev/null +++ b/changes/ticket30150 @@ -0,0 +1,4 @@ + o Minor bugfixes (static analysis): + - Fix several spurious Coverity warnings about the unit tests, to lower our + chances of missing any real warnings in the future. Fixes bug 30150; + bugfix on 0.3.5.1-alpha and various other Tor versions.

1 0

[stem/master] Travis: remove shellcheck
by atagar＠torproject.org 30 May '19

30 May '19

commit 026dfa4808cf5f9b56dbfba328919e6cfc3b666e Author: teor <teor(a)torproject.org> Date: Thu May 30 18:52:01 2019 +1000 Travis: remove shellcheck The last shell script has been removed from stem master, so there's no need for shellcheck in CI any more. Implements 30650. --- .travis.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2b6ba37e..fdce9332 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,6 @@ matrix: - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-0.2.9.x-xenial main' key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' packages: - - shellcheck - tor env: TOR="0.2.9-nightly" - addons: @@ -48,7 +47,6 @@ matrix: - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-0.3.4.x-xenial main' key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' packages: - - shellcheck - tor env: TOR="0.3.4-nightly" ## The current stable release is 0.3.5, so we don't have a separate @@ -59,7 +57,6 @@ matrix: - sourceline: 'deb https://deb.torproject.org/torproject.org xenial main' key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' packages: - - shellcheck - tor env: TOR="stable-release" - addons: @@ -68,7 +65,6 @@ matrix: - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-0.3.5.x-xenial main' key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' packages: - - shellcheck - tor env: TOR="0.3.5-nightly" ## The experimental deb line needs to be updated when 0.4.0 becomes stable @@ -78,7 +74,6 @@ matrix: - sourceline: 'deb https://deb.torproject.org/torproject.org tor-experimental-0.4.0.x-xenial main' key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' packages: - - shellcheck - tor env: TOR="0.4.0-nightly" @@ -151,12 +146,10 @@ addons: - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-master-xenial main' key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' packages: - - shellcheck - tor ## (macOS only) homebrew: packages: - - shellcheck - tor install: @@ -168,12 +161,9 @@ install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew list --versions; fi - pip list - python --version - - shellcheck --version - tor --version script: - ## Check the only shell script in the repository - - shellcheck docs/republish ## Run stem's tests - ./run_tests.py --unit - ./run_tests.py --integ

1 0

[stem/master] Travis: add --target ONLINE to the latest python and tor versions
by atagar＠torproject.org 30 May '19

30 May '19

commit 36dc1ff55af20a20ad2a9836af0c535159e92cc8 Author: teor <teor(a)torproject.org> Date: Thu May 30 19:05:08 2019 +1000 Travis: add --target ONLINE to the latest python and tor versions Add --target ONLINE on: * macOS, tor stable, python 2.7 * Linux, tor master, python 2.7 * Linux, tor master, python master Closes 30563. --- .travis.yml | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index fdce9332..91029687 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ matrix: - os: osx language: c python: - env: TOR="stable-release" + env: TOR="stable-release" TARGET="--target ONLINE" ## Test all supported and available tor versions on Linux ## If the deb.torproject.org repositories are removed, we will fall back to @@ -40,7 +40,7 @@ matrix: key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' packages: - tor - env: TOR="0.2.9-nightly" + env: TOR="0.2.9-nightly" TARGET="" - addons: apt: sources: @@ -48,7 +48,7 @@ matrix: key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' packages: - tor - env: TOR="0.3.4-nightly" + env: TOR="0.3.4-nightly" TARGET="" ## The current stable release is 0.3.5, so we don't have a separate ## 0.3.5-stable job - addons: @@ -58,7 +58,7 @@ matrix: key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' packages: - tor - env: TOR="stable-release" + env: TOR="stable-release" TARGET="" - addons: apt: sources: @@ -66,7 +66,7 @@ matrix: key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' packages: - tor - env: TOR="0.3.5-nightly" + env: TOR="0.3.5-nightly" TARGET="" ## The experimental deb line needs to be updated when 0.4.0 becomes stable - addons: apt: @@ -75,7 +75,7 @@ matrix: key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' packages: - tor - env: TOR="0.4.0-nightly" + env: TOR="0.4.0-nightly" TARGET="" ## Test all supported python releases ## Pre-installed in Travis xenial: @@ -83,29 +83,37 @@ matrix: ## End of Life: 1 January 2020 ## https://www.python.org/dev/peps/pep-0373/#id2 - python: "2.7" + env: TOR="master-nightly" TARGET="--target ONLINE" ## End of Life: December 2021 ## https://www.python.org/dev/peps/pep-0494/#lifespan - python: "3.6" + env: TOR="master-nightly" TARGET="" ## End of Life: June 2023 ## https://www.python.org/dev/peps/pep-0537/#lifespan - python: "3.7" + env: TOR="master-nightly" TARGET="" ## Stable: 20 October 2019 ## (Switch from 3.8-dev to 3.8, and check for 3.9-dev) ## End of Life: October2024 ## https://www.python.org/dev/peps/pep-0569/#lifespan - python: "3.8-dev" + env: TOR="master-nightly" TARGET="" - python: "nightly" + env: TOR="master-nightly" TARGET="--target ONLINE" # PyPy versions ## End of Life: "forever" ## http://doc.pypy.org/en/latest/faq.html#how-long-will-pypy-support-python2 ## But stem may decide not to support python 2 after 1 Jan 2020. ## Travis Xenial does not support pypy2.7 #- python: "pypy2.7" + # env: TOR="master-nightly" TARGET="" ## PyPy does not have documented end of life dates - python: "pypy3.5" + env: TOR="master-nightly" TARGET="" ## PyPy 3.6 is currently in alpha ## Travis Xenial does not support pypy3.6-dev yet? #- python: "pypy3.6-dev" + # env: TOR="master-nightly" TARGET="" ## Uncomment to allow the build to report success (with non-required ## sub-builds continuing to run) if all required sub-builds have @@ -117,7 +125,7 @@ matrix: ## These builds fail in Travis at the moment #allow_failures: - # - env: TOR="master-nightly" + # - env: TOR="master-nightly" TARGET="--target ONLINE" ## We don't need sudo. (The "apt:" stanza after this allows us to not need ## sudo; otherwise, we would need it for getting dependencies.) @@ -133,10 +141,9 @@ dist: xenial #osx_image: xcode9.4 ## The TOR env var should be kept in sync with the Linux tor version below -## We use the basic-min network by default, to reduce load and increase -## reliability +## This line doesn't actually create any Travis jobs env: - - TOR="master-nightly" + - TOR="master-nightly" TARGET="--target ONLINE" ## Download our dependencies addons: @@ -166,7 +173,7 @@ install: script: ## Run stem's tests - ./run_tests.py --unit - - ./run_tests.py --integ + - ./run_tests.py --integ $TARGET after_failure: ## Show the integ tor log

1 0

[tor/master] changes file for 30629
by dgoulet＠torproject.org 30 May '19

30 May '19

commit 8f3430fc28be9ac16909fd02e0d48aad4ccc128e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 30 12:58:12 2019 -0400 changes file for 30629 --- changes/bug30629 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/changes/bug30629 b/changes/bug30629 new file mode 100644 index 000000000..59fa96ee6 --- /dev/null +++ b/changes/bug30629 @@ -0,0 +1,6 @@ + o Minor bugfixes (shutdown, libevent, memory safety): + - Avoid use-after-free bugs when shutting down, by making sure that we + shut down libevent only after shutting down all of its users. We + believe these are harmless in practice, since they only occur on the + shutdown path, and do not involve any attacker-controlled data. Fixes + bug 30629; bugfix on 0.4.1.1-alpha.

1 0

[tor/master] Merge branch 'tor-github/pr/1057'
by dgoulet＠torproject.org 30 May '19

30 May '19

commit 8dfc8d7063bf4b317bd47b7a2e8cccb0a428e861 Merge: a462ca7cc 8f3430fc2 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu May 30 12:58:35 2019 -0400 Merge branch 'tor-github/pr/1057' changes/bug30629 | 6 ++++++ src/app/main/shutdown.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/master] Shutdown libevent _after_ the subsystems.
by dgoulet＠torproject.org 30 May '19

30 May '19

commit ba9b0319b00692038e5d4aa2eff7cf5d6947e659 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 29 11:25:47 2019 -0400 Shutdown libevent _after_ the subsystems. This is necessary since shutting down libevent frees some pointer that the subsystems want to free themselves. A longer term solution will be to turn the evloop module into a subsystem itself, but for now it is best to do the minimal fix. Fixes bug 30629; bugfix on 0.4.1.1-alpha. --- src/app/main/shutdown.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/main/shutdown.c b/src/app/main/shutdown.c index e4dcaa132..cc0091a9a 100644 --- a/src/app/main/shutdown.c +++ b/src/app/main/shutdown.c @@ -157,10 +157,11 @@ tor_free_all(int postfork) if (!postfork) { release_lockfile(); } - tor_libevent_free_all(); subsystems_shutdown(); + tor_libevent_free_all(); + /* Stuff in util.c and address.c*/ if (!postfork) { esc_router_info(NULL);

1 0

[tor/master] Remove want_cmddata from HSFETCH, which does not in fact want data
by dgoulet＠torproject.org 30 May '19

30 May '19

commit 2d66250d8acfc61210442df94fe04df09c2dbab6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 29 10:10:57 2019 -0400 Remove want_cmddata from HSFETCH, which does not in fact want data This looks a copy-and-paste error to me. Fixes bug 30646; bugfix on 0.4.1.1-alpha. --- changes/bug30646 | 4 ++++ src/feature/control/control_cmd.c | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug30646 b/changes/bug30646 new file mode 100644 index 000000000..e95a54e3e --- /dev/null +++ b/changes/bug30646 @@ -0,0 +1,4 @@ + o Minor bugfixes (controller): + - Repair the HSFETCH command so that it works again. Previously, it + expected a body when it shouldn't have. Fixes bug 30646; bugfix on + 0.4.1.1-alpha. diff --git a/src/feature/control/control_cmd.c b/src/feature/control/control_cmd.c index 17d5b0c7f..abb579bd4 100644 --- a/src/feature/control/control_cmd.c +++ b/src/feature/control/control_cmd.c @@ -1385,7 +1385,6 @@ static const control_cmd_syntax_t hsfetch_syntax = { .min_args = 1, .max_args = 1, .accept_keywords = true, .allowed_keywords = hsfetch_keywords, - .want_cmddata = true, }; /** Implementation for the HSFETCH command. */

1 0

[tor/master] Merge branch 'tor-github/pr/1055'
by dgoulet＠torproject.org 30 May '19

30 May '19

commit a462ca7cce3699f488b5e2f2921738c944cb29c7 Merge: ef9170db4 2d66250d8 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu May 30 12:53:52 2019 -0400 Merge branch 'tor-github/pr/1055' changes/bug30646 | 4 ++++ src/feature/control/control_cmd.c | 1 - 2 files changed, 4 insertions(+), 1 deletion(-)

1 0