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

[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. failure * 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

[tor/release-0.2.7] Whoops; infinite recursion
by nickm＠torproject.org 21 Oct '15

21 Oct '15

commit 5d45a26f39816c17459a3c71617cddcd3d19cea6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 21 10:56:27 2015 -0400 Whoops; infinite recursion --- src/or/rendcache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/rendcache.c b/src/or/rendcache.c index 93f4440..d4bdd68 100644 --- a/src/or/rendcache.c +++ b/src/or/rendcache.c @@ -125,7 +125,7 @@ rend_cache_failure_intro_entry_free(rend_cache_failure_intro_t *entry) static void rend_cache_failure_intro_entry_free_(void *entry) { - rend_cache_failure_intro_entry_free_(entry); + rend_cache_failure_intro_entry_free(entry); } /** Allocate a rend cache failure intro object and return it. failure

1 0

[tor/release-0.2.7] Merge branch 'maint-0.2.7' into release-0.2.7
by nickm＠torproject.org 21 Oct '15

21 Oct '15

commit ff174995f07747628ad1e71fd344fc27e88a70ed Merge: fbaee1b 5d45a26 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 21 11:06:47 2015 -0400 Merge branch 'maint-0.2.7' into release-0.2.7 changes/bug17398 | 3 +++ changes/bug17401 | 3 +++ changes/bug17402 | 3 +++ src/common/crypto_ed25519.c | 1 + src/or/rendcache.c | 24 ++++++++++++++++-------- 5 files changed, 26 insertions(+), 8 deletions(-)

1 0

[tor/master] Fix all leaks (and an introduced failure) in the rendcache tests
by nickm＠torproject.org 21 Oct '15

21 Oct '15

commit 9f5210ae4647749372c022b804dccbc73240aa0e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 21 11:05:27 2015 -0400 Fix all leaks (and an introduced failure) in the rendcache tests --- src/test/test_rendcache.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/test/test_rendcache.c b/src/test/test_rendcache.c index a1c456c..dda527f 100644 --- a/src/test/test_rendcache.c +++ b/src/test/test_rendcache.c @@ -533,6 +533,7 @@ test_rend_cache_store_v2_desc_as_dir(void *data) rend_encoded_v2_service_descriptor_free(desc_holder); tor_free(service_id); rend_cache_free_all(); + tor_free(mock_routerinfo); } static void @@ -598,6 +599,7 @@ test_rend_cache_store_v2_desc_as_dir_with_different_time(void *data) smartlist_free(descs); rend_encoded_v2_service_descriptor_free(desc_holder_newer); rend_encoded_v2_service_descriptor_free(desc_holder_older); + tor_free(mock_routerinfo); } static void @@ -869,7 +871,7 @@ test_rend_cache_failure_entry_new(void *data) tt_int_op(digestmap_size(failure->intro_failures), OP_EQ, 0); done: - tor_free(failure); + rend_cache_failure_entry_free(failure); } static void @@ -959,6 +961,8 @@ test_rend_cache_failure_remove(void *data) // There seems to not exist any way of getting rend_cache_failure_remove() // to fail because of a problem with rend_get_service_id from here rend_cache_free_all(); + + rend_service_descriptor_free(desc); /* done: */ /* (void)0; */ } @@ -1036,7 +1040,8 @@ test_rend_cache_purge(void *data) our_rend_cache = rend_cache; rend_cache_purge(); tt_assert(rend_cache); - tt_assert(rend_cache == our_rend_cache); + tt_assert(strmap_size(rend_cache) == 0); + tt_assert(rend_cache != our_rend_cache); done: rend_cache_free_all(); @@ -1199,7 +1204,7 @@ test_rend_cache_entry_allocation(void *data) (void)data; size_t ret; - rend_cache_entry_t *e; + rend_cache_entry_t *e = NULL; // Handles a null argument ret = rend_cache_entry_allocation(NULL); @@ -1211,7 +1216,7 @@ test_rend_cache_entry_allocation(void *data) tt_int_op(ret, OP_GT, sizeof(rend_cache_entry_t)); done: - (void)0; + tor_free(e); } static void

1 0

[tor/master] Whoops; infinite recursion
by nickm＠torproject.org 21 Oct '15

21 Oct '15

commit 5d45a26f39816c17459a3c71617cddcd3d19cea6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 21 10:56:27 2015 -0400 Whoops; infinite recursion --- src/or/rendcache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/rendcache.c b/src/or/rendcache.c index 93f4440..d4bdd68 100644 --- a/src/or/rendcache.c +++ b/src/or/rendcache.c @@ -125,7 +125,7 @@ rend_cache_failure_intro_entry_free(rend_cache_failure_intro_t *entry) static void rend_cache_failure_intro_entry_free_(void *entry) { - rend_cache_failure_intro_entry_free_(entry); + rend_cache_failure_intro_entry_free(entry); } /** Allocate a rend cache failure intro object and return it. failure

1 0

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

21 Oct '15

commit 35edd74e25cb077a89a9d6c14e542d1d1ffc7c8e Merge: d14b009 5d45a26 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 21 10:56:40 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.7' src/or/rendcache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/maint-0.2.7] Whoops; infinite recursion
by nickm＠torproject.org 21 Oct '15

21 Oct '15

commit 5d45a26f39816c17459a3c71617cddcd3d19cea6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 21 10:56:27 2015 -0400 Whoops; infinite recursion --- src/or/rendcache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/rendcache.c b/src/or/rendcache.c index 93f4440..d4bdd68 100644 --- a/src/or/rendcache.c +++ b/src/or/rendcache.c @@ -125,7 +125,7 @@ rend_cache_failure_intro_entry_free(rend_cache_failure_intro_t *entry) static void rend_cache_failure_intro_entry_free_(void *entry) { - rend_cache_failure_intro_entry_free_(entry); + rend_cache_failure_intro_entry_free(entry); } /** Allocate a rend cache failure intro object and return it. failure

1 0

[tor/master] 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 desc, check if the introduction points

1 0

[tor/master] More leaks here
by nickm＠torproject.org 21 Oct '15

21 Oct '15

commit 6ef35319d9d2f9ed5cdd6f73089029c7cfce0d43 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 21 10:28:10 2015 -0400 More leaks here --- src/test/test_rendcache.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/test/test_rendcache.c b/src/test/test_rendcache.c index 32ba499..5574d3d 100644 --- a/src/test/test_rendcache.c +++ b/src/test/test_rendcache.c @@ -205,7 +205,7 @@ test_rend_cache_store_v2_desc_as_client(void *data) rend_cache_init(); rend_encoded_v2_service_descriptor_free(desc_holder); tor_free(service_id); - tor_free(entry); + rend_data_free(mock_rend_query); generate_desc(RECENT_TIME, &desc_holder, &service_id, 3); mock_rend_query = mock_rend_data(service_id); @@ -230,6 +230,7 @@ test_rend_cache_store_v2_desc_as_client(void *data) rend_cache_init(); rend_encoded_v2_service_descriptor_free(desc_holder); tor_free(service_id); + rend_data_free(mock_rend_query); generate_desc(RECENT_TIME, &desc_holder, &service_id, 3); mock_rend_query = mock_rend_data(service_id); @@ -296,7 +297,6 @@ test_rend_cache_store_v2_desc_as_client(void *data) done: rend_encoded_v2_service_descriptor_free(desc_holder); - tor_free(entry); tor_free(service_id); rend_cache_free_all(); rend_data_free(mock_rend_query); @@ -606,8 +606,8 @@ test_rend_cache_store_v2_desc_as_dir_with_different_content(void *data) smartlist_t *descs = smartlist_new(); time_t t; char *service_id = NULL; - rend_encoded_v2_service_descriptor_t *desc_holder_one; - rend_encoded_v2_service_descriptor_t *desc_holder_two; + rend_encoded_v2_service_descriptor_t *desc_holder_one = NULL; + rend_encoded_v2_service_descriptor_t *desc_holder_two = NULL; NS_MOCK(router_get_my_routerinfo); NS_MOCK(hid_serv_responsible_for_desc_id); @@ -653,6 +653,8 @@ test_rend_cache_store_v2_desc_as_dir_with_different_content(void *data) SMARTLIST_FOREACH(descs, rend_encoded_v2_service_descriptor_t *, d, rend_encoded_v2_service_descriptor_free(d)); smartlist_free(descs); + rend_encoded_v2_service_descriptor_free(desc_holder_one); + rend_encoded_v2_service_descriptor_free(desc_holder_two); } #undef NS_SUBMODULE

1 0

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

21 Oct '15

commit a5e873ff29d066532322a6946c2bc4d034be8c2d Merge: 6ef3531 03eb999 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 21 10:28:16 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.7' src/or/rendcache.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

1 0