October 2015 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.7'
by nickm＠torproject.org 21 Oct '15

21 Oct '15

commit 52fd384a465ba91762bc4f71d239ed1e5150f947 Merge: f41be5f 9c4a0ae Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 21 11:18:11 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.7' changes/bug17403 | 3 +++ src/or/routerkeys.c | 2 ++ 2 files changed, 5 insertions(+)

1 0

[tor/master] Fix a memory leak in reading an expired ed signing key.
by nickm＠torproject.org 21 Oct '15

21 Oct '15

commit 9c4a0aef0c0d8e1c3ad8d9ed7b655eae8a175ccb Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 21 11:16:28 2015 -0400 Fix a memory leak in reading an expired ed signing key. Closes 17403. --- changes/bug17403 | 3 +++ src/or/routerkeys.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/changes/bug17403 b/changes/bug17403 new file mode 100644 index 0000000..e83a4a2 --- /dev/null +++ b/changes/bug17403 @@ -0,0 +1,3 @@ + o Minor bugfixes (memory leaks): + - Fix a memory leak when reading an expired signing key from disk. + Fixes bug 17403; bugfix on 0.2.7.2-rc. diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c index 765dac8..d88bfca 100644 --- a/src/or/routerkeys.c +++ b/src/or/routerkeys.c @@ -836,6 +836,8 @@ load_ed_keys(const or_options_t *options, time_t now) INIT_ED_KEY_INCLUDE_SIGNING_KEY_IN_CERT); char *fname = options_get_datadir_fname2(options, "keys", "ed25519_signing"); + ed25519_keypair_free(sign); + tor_cert_free(sign_cert); sign = ed_key_init_from_file(fname, flags, LOG_WARN, sign_signing_key_with_id, now,

1 0

[tor/master] memory leaks in procmon tests
by nickm＠torproject.org 21 Oct '15

21 Oct '15

commit f41be5f9df1bb944c52431f3740e90716b42db6c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 21 11:17:59 2015 -0400 memory leaks in procmon tests --- src/test/test_procmon.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/test_procmon.c b/src/test/test_procmon.c index 4eff52a..2855178 100644 --- a/src/test/test_procmon.c +++ b/src/test/test_procmon.c @@ -33,11 +33,13 @@ test_procmon_tor_process_monitor_new(void *ignored) NULL, NULL, &msg); tt_assert(res); tt_assert(!msg); + tor_process_monitor_free(res); res = tor_process_monitor_new(tor_libevent_get_base(), "44 hello", 0, NULL, NULL, &msg); tt_assert(res); tt_assert(!msg); + tor_process_monitor_free(res); res = tor_process_monitor_new(tor_libevent_get_base(), "45:hello", 0, NULL, NULL, &msg); @@ -45,7 +47,7 @@ test_procmon_tor_process_monitor_new(void *ignored) tt_assert(!msg); done: - (void)0; + tor_process_monitor_free(res); } struct testcase_t procmon_tests[] = {

1 0

[tor/maint-0.2.7] Fix a memory leak in reading an expired ed signing key.
by nickm＠torproject.org 21 Oct '15

21 Oct '15

commit 9c4a0aef0c0d8e1c3ad8d9ed7b655eae8a175ccb Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 21 11:16:28 2015 -0400 Fix a memory leak in reading an expired ed signing key. Closes 17403. --- changes/bug17403 | 3 +++ src/or/routerkeys.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/changes/bug17403 b/changes/bug17403 new file mode 100644 index 0000000..e83a4a2 --- /dev/null +++ b/changes/bug17403 @@ -0,0 +1,3 @@ + o Minor bugfixes (memory leaks): + - Fix a memory leak when reading an expired signing key from disk. + Fixes bug 17403; bugfix on 0.2.7.2-rc. diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c index 765dac8..d88bfca 100644 --- a/src/or/routerkeys.c +++ b/src/or/routerkeys.c @@ -836,6 +836,8 @@ load_ed_keys(const or_options_t *options, time_t now) INIT_ED_KEY_INCLUDE_SIGNING_KEY_IN_CERT); char *fname = options_get_datadir_fname2(options, "keys", "ed25519_signing"); + ed25519_keypair_free(sign); + tor_cert_free(sign_cert); sign = ed_key_init_from_file(fname, flags, LOG_WARN, sign_signing_key_with_id, now,

1 0

[tor/release-0.2.7] Reflow changelog
by nickm＠torproject.org 21 Oct '15

21 Oct '15

commit 3f3a753e36a3d6114fcaa7059a534317f5a59fc0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 21 11:09:41 2015 -0400 Reflow changelog --- ChangeLog | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5041e76..259e4e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,15 +4,15 @@ Changes in version 0.2.7.4-rc - 2015-10-21 on different platforms. If no further significant bounds are found, the next release will the the official stable release. - o Major bugfixes (memory leaks): - - Fix a memory leak in ed25519 batch signature checking. - Fixes bug 17398; bugfix on 0.2.6.1-alpha. - - Fix a memory leak in rend_cache_failure_entry_free(). - Fixes bug 17402; bugfix on 0.2.7.3-rc. - o Major bugfixes (correctness): - - Fix a use-after-free bug in validate_intro_point_failure(). - Fixes bug 17401; bugfix on 0.2.7.3-rc. + - Fix a use-after-free bug in validate_intro_point_failure(). Fixes + bug 17401; bugfix on 0.2.7.3-rc. + + o Major bugfixes (memory leaks): + - Fix a memory leak in ed25519 batch signature checking. Fixes bug + 17398; bugfix on 0.2.6.1-alpha. + - Fix a memory leak in rend_cache_failure_entry_free(). Fixes bug + 17402; bugfix on 0.2.7.3-rc. o Minor features (geoIP): - Update geoip and geoip6 to the October 9 2015 Maxmind GeoLite2

1 0

[tor/release-0.2.7] Fold new entries into ChangeLog for 0.2.7.4-rc
by nickm＠torproject.org 21 Oct '15

21 Oct '15

commit cc3ce6854872fb9b06fbb5bb188c1c58585af282 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 21 11:09:16 2015 -0400 Fold new entries into ChangeLog for 0.2.7.4-rc --- ChangeLog | 10 ++++++++++ changes/bug15609 | 2 -- changes/bug17151 | 7 ------- changes/bug17154 | 3 --- changes/bug17173-socket-hack-rv | 3 --- changes/bug17237_027 | 3 --- changes/bug17251 | 3 --- changes/bug17347 | 4 ---- changes/bug17354 | 4 ---- changes/bug17398 | 3 --- changes/bug17401 | 3 --- changes/bug17402 | 3 --- changes/geoip-october2015 | 3 --- changes/ifaddrs-tests-network-configs | 5 ----- 14 files changed, 10 insertions(+), 46 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f6c2d4..5041e76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,16 @@ Changes in version 0.2.7.4-rc - 2015-10-21 on different platforms. If no further significant bounds are found, the next release will the the official stable release. + o Major bugfixes (memory leaks): + - Fix a memory leak in ed25519 batch signature checking. + Fixes bug 17398; bugfix on 0.2.6.1-alpha. + - Fix a memory leak in rend_cache_failure_entry_free(). + Fixes bug 17402; bugfix on 0.2.7.3-rc. + + o Major bugfixes (correctness): + - Fix a use-after-free bug in validate_intro_point_failure(). + Fixes bug 17401; bugfix on 0.2.7.3-rc. + o Minor features (geoIP): - Update geoip and geoip6 to the October 9 2015 Maxmind GeoLite2 Country database. diff --git a/changes/bug15609 b/changes/bug15609 deleted file mode 100644 index efaccde..0000000 --- a/changes/bug15609 +++ /dev/null @@ -1,2 +0,0 @@ - o Documentation: - - Fix capitalization of SOCKS in sample torrc. Closes ticket 15609. diff --git a/changes/bug17151 b/changes/bug17151 deleted file mode 100644 index 0993b90..0000000 --- a/changes/bug17151 +++ /dev/null @@ -1,7 +0,0 @@ - o Minor bugfixes (portability): - - Use libexecinfo on FreeBSD, to enable backtrace support. Fixes part of - bug 17151; bugfix on 0.2.5.2-alpha. Patch from Marcin Cieślak. - - o Minor bugfixes (testing): - - Skip backtrace tests when backtrace support is not compiled in. Fixes - part of bug 17151; bugfix on 0.2.7.1-alpha. Patch from Marcin Cieślak. diff --git a/changes/bug17154 b/changes/bug17154 deleted file mode 100644 index 6ad7b74..0000000 --- a/changes/bug17154 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (testing): - - Fix breakage when running 'make check' with BSD make. Fixes bug - 17154; bugfix on 0.2.7.3-rc. Patch by Marcin Cieślak. diff --git a/changes/bug17173-socket-hack-rv b/changes/bug17173-socket-hack-rv deleted file mode 100644 index d513211..0000000 --- a/changes/bug17173-socket-hack-rv +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bug fixes (addresses, testing): - - Add unit tests for get_interface_address* failure cases. - Fixes bug 17173; bugfix on 0.2.7.3-rc. Patch by fk/teor. diff --git a/changes/bug17237_027 b/changes/bug17237_027 deleted file mode 100644 index e5978d0..0000000 --- a/changes/bug17237_027 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features (compilation): - - Repair compilation with the most recent (unreleased, alpha) - vesions of OpenSSL 1.1. Fixes part of ticket 17237. diff --git a/changes/bug17251 b/changes/bug17251 deleted file mode 100644 index edd7739..0000000 --- a/changes/bug17251 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (compilation): - - Fix an integer overflow warning in test_crypto_slow.c. - Fixes bug 17251; bugfix on 0.2.7.2-alpha. diff --git a/changes/bug17347 b/changes/bug17347 deleted file mode 100644 index 487b132..0000000 --- a/changes/bug17347 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (compilation): - - Fix compilation of sandbox.c with musl-libc. - Fixes bug 17347; bugfix on 0.2.5.1-alpha. - Patch from 'jamestk'. diff --git a/changes/bug17354 b/changes/bug17354 deleted file mode 100644 index 53da007..0000000 --- a/changes/bug17354 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (sandbox): - - Add the "hidserv-stats" filename to our sandbox filter for the - HiddenServiceStatistics option to work properly. Fixes bug 17354; - bugfix on tor-0.2.6.2-alpha~54^2~1. Patch from David Goulet. diff --git a/changes/bug17398 b/changes/bug17398 deleted file mode 100644 index 66e27a6..0000000 --- a/changes/bug17398 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (memory leaks): - - Fix a memory leak in ed25519 batch signature checking. - Fixes bug 17398; bugfix on 0.2.6.1-alpha. diff --git a/changes/bug17401 b/changes/bug17401 deleted file mode 100644 index a22f79c..0000000 --- a/changes/bug17401 +++ /dev/null @@ -1,3 +0,0 @@ - o Major bugfixes (correctness): - - Fix a use-after-free bug in validate_intro_point_failure(). - Fixes bug 17401; bugfix on 0.2.7.3-rc. diff --git a/changes/bug17402 b/changes/bug17402 deleted file mode 100644 index 4760e00..0000000 --- a/changes/bug17402 +++ /dev/null @@ -1,3 +0,0 @@ - o Major bugfixes (memory leak): - - Fix a memory leak in rend_cache_failure_entry_free(). - Fixes bug 17402; bugfix on 0.2.7.3-rc. diff --git a/changes/geoip-october2015 b/changes/geoip-october2015 deleted file mode 100644 index f20febe..0000000 --- a/changes/geoip-october2015 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update geoip and geoip6 to the October 9 2015 Maxmind GeoLite2 Country database. - diff --git a/changes/ifaddrs-tests-network-configs b/changes/ifaddrs-tests-network-configs deleted file mode 100644 index 6b5ed4d..0000000 --- a/changes/ifaddrs-tests-network-configs +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (testing): - - Make the get_ifaddrs_* unit tests more tolerant of different network - configurations. (Don't assume every test box has an IPv4 address, and - Don't assume every test box has a non-localhost address. - Fixes bug 17255; bugfix on 0.2.7.3-rc. Patch by "teor".

1 0

[tor/release-0.2.7] Fix a memory leak; bug 17398.
by nickm＠torproject.org 21 Oct '15

21 Oct '15

commit 542cc8a5fff7b566cb44185e1fb6aae8ff469a16 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 21 08:17:07 2015 -0400 Fix a memory leak; bug 17398. --- changes/bug17398 | 3 +++ src/common/crypto_ed25519.c | 1 + 2 files changed, 4 insertions(+) diff --git a/changes/bug17398 b/changes/bug17398 new file mode 100644 index 0000000..66e27a6 --- /dev/null +++ b/changes/bug17398 @@ -0,0 +1,3 @@ + o Minor bugfixes (memory leaks): + - Fix a memory leak in ed25519 batch signature checking. + Fixes bug 17398; bugfix on 0.2.6.1-alpha. diff --git a/src/common/crypto_ed25519.c b/src/common/crypto_ed25519.c index 7e995f4..1749efc 100644 --- a/src/common/crypto_ed25519.c +++ b/src/common/crypto_ed25519.c @@ -260,6 +260,7 @@ ed25519_checksig_batch(int *okay_out, tor_free(ms); tor_free(lens); tor_free(pks); + tor_free(sigs); if (! okay_out) tor_free(oks); }

1 0

[tor/release-0.2.7] Fix a use-after-free in validate_intro_point_failure. Bug 17401. Found w valgrind
by nickm＠torproject.org 21 Oct '15

21 Oct '15

commit 5b2070198a9fa7d19f50ba165dc6ff274ffe073a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 21 09:59:19 2015 -0400 Fix a use-after-free in validate_intro_point_failure. Bug 17401. Found w valgrind --- changes/bug17401 | 3 +++ src/or/rendcache.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug17401 b/changes/bug17401 new file mode 100644 index 0000000..a22f79c --- /dev/null +++ b/changes/bug17401 @@ -0,0 +1,3 @@ + o Major bugfixes (correctness): + - Fix a use-after-free bug in validate_intro_point_failure(). + Fixes bug 17401; bugfix on 0.2.7.3-rc. diff --git a/src/or/rendcache.c b/src/or/rendcache.c index 542d322..df4f517 100644 --- a/src/or/rendcache.c +++ b/src/or/rendcache.c @@ -400,9 +400,10 @@ validate_intro_point_failure(const rend_service_descriptor_t *desc, /* This intro point is in our cache, discard it from the descriptor * because chances are that it's unusable. */ SMARTLIST_DEL_CURRENT(desc->intro_nodes, intro); - rend_intro_point_free(intro); /* Keep it for our new entry. */ digestmap_set(new_entry->intro_failures, (char *) identity, ent_dup); + /* Only free it when we're done looking at it. */ + rend_intro_point_free(intro); continue; } } SMARTLIST_FOREACH_END(intro);

1 0

[tor/release-0.2.7] Fix an (unreachable) memory leak in rendcache.c
by nickm＠torproject.org 21 Oct '15

21 Oct '15

commit 03eb999d42a582bece2063fc06f34fad72e05be5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 21 10:27:19 2015 -0400 Fix an (unreachable) memory leak in rendcache.c The 0.2.8 unit tests provoke this leak, though I don't think it can happen IRL. --- src/or/rendcache.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/or/rendcache.c b/src/or/rendcache.c index df4f517..4a12b08 100644 --- a/src/or/rendcache.c +++ b/src/or/rendcache.c @@ -353,7 +353,7 @@ cache_failure_intro_add(const uint8_t *identity, const char *service_id, rend_intro_point_failure_t failure) { rend_cache_failure_t *fail_entry; - rend_cache_failure_intro_t *entry; + rend_cache_failure_intro_t *entry, *old_entry; /* Make sure we have a failure object for this service ID and if not, * create it with this new intro failure entry. */ @@ -364,7 +364,10 @@ cache_failure_intro_add(const uint8_t *identity, const char *service_id, strmap_set_lc(rend_cache_failure, service_id, fail_entry); } entry = rend_cache_failure_intro_entry_new(failure); - digestmap_set(fail_entry->intro_failures, (char *) identity, entry); + old_entry = digestmap_set(fail_entry->intro_failures, + (char *) identity, entry); + /* This _should_ be NULL, but in case it isn't, free it. */ + rend_cache_failure_intro_entry_free(old_entry); } /** Using a parsed descriptor <b>desc</b>, check if the introduction points

1 0

[tor/release-0.2.7] Fix memory leak in rend_cache_failure_entry_free()
by nickm＠torproject.org 21 Oct '15

21 Oct '15

commit aa96abe66b7ac507e927d4cfe37d78eaf754179e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 21 10:52:57 2015 -0400 Fix memory leak in rend_cache_failure_entry_free() Bug 17402. --- changes/bug17402 | 3 +++ src/or/rendcache.c | 14 +++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/changes/bug17402 b/changes/bug17402 new file mode 100644 index 0000000..4760e00 --- /dev/null +++ b/changes/bug17402 @@ -0,0 +1,3 @@ + o Major bugfixes (memory leak): + - Fix a memory leak in rend_cache_failure_entry_free(). + Fixes bug 17402; bugfix on 0.2.7.3-rc. diff --git a/src/or/rendcache.c b/src/or/rendcache.c index 4a12b08..93f4440 100644 --- a/src/or/rendcache.c +++ b/src/or/rendcache.c @@ -122,6 +122,12 @@ rend_cache_failure_intro_entry_free(rend_cache_failure_intro_t *entry) tor_free(entry); } +static void +rend_cache_failure_intro_entry_free_(void *entry) +{ + rend_cache_failure_intro_entry_free_(entry); +} + /** Allocate a rend cache failure intro object and return it. <b>failure</b> * is set into the object. This function can not fail. */ static rend_cache_failure_intro_t * @@ -142,11 +148,9 @@ rend_cache_failure_entry_free(rend_cache_failure_t *entry) } /* Free and remove every intro failure object. */ - DIGESTMAP_FOREACH_MODIFY(entry->intro_failures, key, - rend_cache_failure_intro_t *, e) { - rend_cache_failure_intro_entry_free(e); - MAP_DEL_CURRENT(key); - } DIGESTMAP_FOREACH_END; + digestmap_free(entry->intro_failures, + rend_cache_failure_intro_entry_free_); + tor_free(entry); }

1 0