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

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

24 Apr '18

commit 34e7dca9c9e902a58fe8942cef666f1d99d06030 Merge: 9727b4c5d 612513371 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 24 10:38:19 2018 -0400 Merge branch 'travis_distcheck_029' into maint-0.2.9 .travis.yml | 5 ++++- changes/travis_distcheck | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.1] Add distcheck support to travis configuration.
by nickm＠torproject.org 24 Apr '18

24 Apr '18

commit 61251337153448afa1cc2baae252c3f0d6353162 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 18 14:24:54 2018 -0400 Add distcheck support to travis configuration. Implements 25814. --- .travis.yml | 5 ++++- changes/travis_distcheck | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index dc0a8ac67..6da3027b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -90,6 +90,8 @@ matrix: - compiler: gcc - compiler: gcc env: COVERAGE_OPTIONS="--enable-coverage" + - compiler: gcc + env: DISTCHECK="yes" ## The "sudo: required" forces non-containerized builds, working ## around a Travis CI environment issue: clang LeakAnalyzer fails ## because it requires ptrace and the containerized environment no @@ -118,7 +120,8 @@ script: - ./autogen.sh - ./configure $RUST_OPTIONS $COVERAGE_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening ## We run `make check` because that's what https://jenkins.torproject.org does. - - make check + - if [[ "$DISTCHECK" == "" ]]; then make check; fi + - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$RUST_OPTIONS $COVERAGE_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening"; fi after_failure: ## `make check` will leave a log file with more details of test failures. diff --git a/changes/travis_distcheck b/changes/travis_distcheck new file mode 100644 index 000000000..0f278fe7e --- /dev/null +++ b/changes/travis_distcheck @@ -0,0 +1,4 @@ + o Minor features (continuous integration): + - Our .travis.yml configuration now includes support for testing + the results of "make distcheck". (It's not uncommon for "make check" to + pass but "make distcheck" to fail.) Closes ticket 25814.

1 0

[tor/release-0.3.2] hs: Fix memleak in v3 on SIGHUP
by nickm＠torproject.org 24 Apr '18

24 Apr '18

commit b259008c56c44c32dfeea3ed8d4b06cd61751a88 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Apr 23 11:09:57 2018 -0400 hs: Fix memleak in v3 on SIGHUP Fixes #25901 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug25901 | 3 +++ src/or/hs_service.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/changes/bug25901 b/changes/bug25901 new file mode 100644 index 000000000..3ad30c767 --- /dev/null +++ b/changes/bug25901 @@ -0,0 +1,3 @@ + o Minor bugfixes (hidden service v3): + - Fix a memory leak when an hidden service v3 is configured and gets a + SIGHUP signal. Fixes bug 25901; bugfix on 0.3.2.1-alpha. diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 45810c5c5..8ddd68c69 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -840,6 +840,10 @@ move_hs_state(hs_service_t *src_service, hs_service_t *dst_service) /* Let's do a shallow copy */ dst->intro_circ_retry_started_time = src->intro_circ_retry_started_time; dst->num_intro_circ_launched = src->num_intro_circ_launched; + /* Freeing a NULL replaycache triggers an info LD_BUG. */ + if (dst->replay_cache_rend_cookie != NULL) { + replaycache_free(dst->replay_cache_rend_cookie); + } dst->replay_cache_rend_cookie = src->replay_cache_rend_cookie; src->replay_cache_rend_cookie = NULL; /* steal pointer reference */

1 0

[tor/master] hs: Fix memleak in v3 on SIGHUP
by nickm＠torproject.org 24 Apr '18

24 Apr '18

commit b259008c56c44c32dfeea3ed8d4b06cd61751a88 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Apr 23 11:09:57 2018 -0400 hs: Fix memleak in v3 on SIGHUP Fixes #25901 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug25901 | 3 +++ src/or/hs_service.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/changes/bug25901 b/changes/bug25901 new file mode 100644 index 000000000..3ad30c767 --- /dev/null +++ b/changes/bug25901 @@ -0,0 +1,3 @@ + o Minor bugfixes (hidden service v3): + - Fix a memory leak when an hidden service v3 is configured and gets a + SIGHUP signal. Fixes bug 25901; bugfix on 0.3.2.1-alpha. diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 45810c5c5..8ddd68c69 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -840,6 +840,10 @@ move_hs_state(hs_service_t *src_service, hs_service_t *dst_service) /* Let's do a shallow copy */ dst->intro_circ_retry_started_time = src->intro_circ_retry_started_time; dst->num_intro_circ_launched = src->num_intro_circ_launched; + /* Freeing a NULL replaycache triggers an info LD_BUG. */ + if (dst->replay_cache_rend_cookie != NULL) { + replaycache_free(dst->replay_cache_rend_cookie); + } dst->replay_cache_rend_cookie = src->replay_cache_rend_cookie; src->replay_cache_rend_cookie = NULL; /* steal pointer reference */

1 0

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

24 Apr '18

commit 7e7b052b2a114900b5e6575fd5375dc00c09d5db Merge: 6182f60f7 9187cdb1c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 24 10:37:36 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug25901 | 3 +++ src/or/hs_service.c | 4 ++++ 2 files changed, 7 insertions(+)

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug25901_032_01' into maint-0.3.2
by nickm＠torproject.org 24 Apr '18

24 Apr '18

commit 9187cdb1cd17dd988c6e444705c6153a65948f1e Merge: d2951b381 b259008c5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 24 10:36:17 2018 -0400 Merge remote-tracking branch 'dgoulet/bug25901_032_01' into maint-0.3.2 changes/bug25901 | 3 +++ src/or/hs_service.c | 4 ++++ 2 files changed, 7 insertions(+)

1 0

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

24 Apr '18

commit 31e69ac22278e381c4f46851d1977f6760089a12 Merge: 3abd57fa0 9187cdb1c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 24 10:37:36 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug25901 | 3 +++ src/or/hs_service.c | 4 ++++ 2 files changed, 7 insertions(+)

1 0

[tor/release-0.3.3] Merge remote-tracking branch 'dgoulet/bug25901_032_01' into maint-0.3.2
by nickm＠torproject.org 24 Apr '18

24 Apr '18

commit 9187cdb1cd17dd988c6e444705c6153a65948f1e Merge: d2951b381 b259008c5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 24 10:36:17 2018 -0400 Merge remote-tracking branch 'dgoulet/bug25901_032_01' into maint-0.3.2 changes/bug25901 | 3 +++ src/or/hs_service.c | 4 ++++ 2 files changed, 7 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.3.3'
by nickm＠torproject.org 24 Apr '18

24 Apr '18

commit ea3c3a10a2567d44fae33f5814710e868c2a33bf Merge: 9be7608fd 7e7b052b2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 24 10:37:36 2018 -0400 Merge branch 'maint-0.3.3' changes/bug25901 | 3 +++ src/or/hs_service.c | 4 ++++ 2 files changed, 7 insertions(+)

1 0

[tor/release-0.3.2] Merge remote-tracking branch 'dgoulet/bug25901_032_01' into maint-0.3.2
by nickm＠torproject.org 24 Apr '18

24 Apr '18

commit 9187cdb1cd17dd988c6e444705c6153a65948f1e Merge: d2951b381 b259008c5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 24 10:36:17 2018 -0400 Merge remote-tracking branch 'dgoulet/bug25901_032_01' into maint-0.3.2 changes/bug25901 | 3 +++ src/or/hs_service.c | 4 ++++ 2 files changed, 7 insertions(+)

1 0