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

[tor/master] Fix leaks in dir voting tests
by nickm＠torproject.org 01 May '14

01 May '14

commit 212e982d9b21ae1e13639162e491bd690c3ea7a5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Apr 26 13:32:36 2014 -0400 Fix leaks in dir voting tests --- src/or/networkstatus.c | 3 ++- src/or/networkstatus.h | 4 ++++ src/test/test_dir.c | 14 ++++++++------ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index ef45007..90918d4 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -10,6 +10,7 @@ * client or cache. */ +#define NETWORKSTATUS_PRIVATE #include "or.h" #include "channel.h" #include "circuitmux.h" @@ -183,7 +184,7 @@ router_reload_consensus_networkstatus(void) } /** Free all storage held by the vote_routerstatus object <b>rs</b>. */ -static void +STATIC void vote_routerstatus_free(vote_routerstatus_t *rs) { vote_microdesc_hash_t *h, *next; diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h index 1659818..be0a86c 100644 --- a/src/or/networkstatus.h +++ b/src/or/networkstatus.h @@ -99,5 +99,9 @@ document_signature_t *document_signature_dup(const document_signature_t *sig); void networkstatus_free_all(void); int networkstatus_get_weight_scale_param(networkstatus_t *ns); +#ifdef NETWORKSTATUS_PRIVATE +STATIC void vote_routerstatus_free(vote_routerstatus_t *rs); +#endif + #endif diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 78583fc..90667e9 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -11,6 +11,7 @@ #define ROUTER_PRIVATE #define ROUTERLIST_PRIVATE #define HIBERNATE_PRIVATE +#define NETWORKSTATUS_PRIVATE #include "or.h" #include "config.h" #include "directory.h" @@ -1014,16 +1015,14 @@ vote_tweaks_for_v3ns(networkstatus_t *v, int voter, time_t now) /* Monkey around with the list a bit */ vrs = smartlist_get(v->routerstatus_list, 2); smartlist_del_keeporder(v->routerstatus_list, 2); - tor_free(vrs->version); - tor_free(vrs); + vote_routerstatus_free(vrs); vrs = smartlist_get(v->routerstatus_list, 0); vrs->status.is_fast = 1; if (voter == 3) { vrs = smartlist_get(v->routerstatus_list, 0); smartlist_del_keeporder(v->routerstatus_list, 0); - tor_free(vrs->version); - tor_free(vrs); + vote_routerstatus_free(vrs); vrs = smartlist_get(v->routerstatus_list, 0); memset(vrs->status.descriptor_digest, (int)'Z', DIGEST_LEN); test_assert(router_add_to_routerlist( @@ -1363,7 +1362,8 @@ test_a_networkstatus( vote->dist_seconds = 300; authority_cert_free(vote->cert); vote->cert = authority_cert_dup(cert2); - vote->net_params = smartlist_new(); + SMARTLIST_FOREACH(vote->net_params, char *, c, tor_free(c)); + smartlist_clear(vote->net_params); smartlist_split_string(vote->net_params, "bar=2000000000 circuitwindow=20", NULL, 0, 0); tor_free(vote->client_versions); @@ -1407,7 +1407,8 @@ test_a_networkstatus( vote->dist_seconds = 250; authority_cert_free(vote->cert); vote->cert = authority_cert_dup(cert3); - vote->net_params = smartlist_new(); + SMARTLIST_FOREACH(vote->net_params, char *, c, tor_free(c)); + smartlist_clear(vote->net_params); smartlist_split_string(vote->net_params, "circuitwindow=80 foo=660", NULL, 0, 0); smartlist_add(vote->supported_methods, tor_strdup("4")); @@ -1984,6 +1985,7 @@ vote_tweaks_for_umbw(networkstatus_t *v, int voter, time_t now) (void)now; test_assert(v->supported_methods); + SMARTLIST_FOREACH(v->supported_methods, char *, c, tor_free(c)); smartlist_clear(v->supported_methods); /* Method 17 is MIN_METHOD_TO_CLIP_UNMEASURED_BW_KB */ smartlist_split_string(v->supported_methods,

1 0

[tor/master] Fix leaks in tests related to setting options->DataDirectory
by nickm＠torproject.org 01 May '14

01 May '14

commit aa0eb2022342798fc78b2bde89d393f37c59fe78 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Apr 26 14:48:30 2014 -0400 Fix leaks in tests related to setting options->DataDirectory We pre-populate that value in main(), and we weren't freeing it before overriding it. --- src/test/test_config.c | 13 ++++++++++--- src/test/test_extorport.c | 1 + src/test/test_microdesc.c | 1 + src/test/test_routerkeys.c | 1 + 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/test/test_config.c b/src/test/test_config.c index 82bc92d..d3e3252 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -196,9 +196,9 @@ static void test_config_check_or_create_data_subdir(void *arg) { or_options_t *options = get_options_mutable(); - char *datadir = options->DataDirectory = tor_strdup(get_fname("datadir-0")); + char *datadir; const char *subdir = "test_stats"; - char *subpath = get_datadir_fname(subdir); + char *subpath; struct stat st; int r; #if !defined (_WIN32) || defined (WINCE) @@ -206,6 +206,10 @@ test_config_check_or_create_data_subdir(void *arg) #endif (void)arg; + tor_free(options->DataDirectory); + datadir = options->DataDirectory = tor_strdup(get_fname("datadir-0")); + subpath = get_datadir_fname(subdir); + #if defined (_WIN32) && !defined (WINCE) tt_int_op(mkdir(options->DataDirectory), ==, 0); #else @@ -254,7 +258,7 @@ static void test_config_write_to_data_subdir(void *arg) { or_options_t* options = get_options_mutable(); - char *datadir = options->DataDirectory = tor_strdup(get_fname("datadir-1")); + char *datadir; char *cp = NULL; const char* subdir = "test_stats"; const char* fname = "test_file"; @@ -276,6 +280,9 @@ test_config_write_to_data_subdir(void *arg) char* filepath = get_datadir_fname2(subdir, fname); (void)arg; + tor_free(options->DataDirectory); + datadir = options->DataDirectory = tor_strdup(get_fname("datadir-1")); + #if defined (_WIN32) && !defined (WINCE) tt_int_op(mkdir(options->DataDirectory), ==, 0); #else diff --git a/src/test/test_extorport.c b/src/test/test_extorport.c index f91ac74..d47792f 100644 --- a/src/test/test_extorport.c +++ b/src/test/test_extorport.c @@ -172,6 +172,7 @@ test_ext_or_init_auth(void *arg) (void)arg; /* Check default filename location */ + tor_free(options->DataDirectory); options->DataDirectory = tor_strdup("foo"); cp = get_ext_or_auth_cookie_file_name(); tt_str_op(cp, ==, "foo"PATH_SEPARATOR"extended_orport_auth_cookie"); diff --git a/src/test/test_microdesc.c b/src/test/test_microdesc.c index 53a03a4..2982484 100644 --- a/src/test/test_microdesc.c +++ b/src/test/test_microdesc.c @@ -261,6 +261,7 @@ test_md_cache_broken(void *data) options = get_options_mutable(); tt_assert(options); + tor_free(options->DataDirectory); options->DataDirectory = tor_strdup(get_fname("md_datadir_test2")); #ifdef _WIN32 diff --git a/src/test/test_routerkeys.c b/src/test/test_routerkeys.c index 1c8174b..182e0f6 100644 --- a/src/test/test_routerkeys.c +++ b/src/test/test_routerkeys.c @@ -27,6 +27,7 @@ test_routerkeys_write_fingerprint(void *arg) tt_assert(key); options->ORPort_set = 1; /* So that we can get the server ID key */ + tor_free(options->DataDirectory); options->DataDirectory = tor_strdup(ddir); options->Nickname = tor_strdup("haflinger"); set_server_identity_key(key);

1 0

[tor/master] Fix memory leaks in test_status.c
by nickm＠torproject.org 01 May '14

01 May '14

commit ee9ed9d817ebfb9101030ed0f899871ba8113b74 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Apr 26 13:39:15 2014 -0400 Fix memory leaks in test_status.c --- src/test/test_status.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/test/test_status.c b/src/test/test_status.c index b704053..46dd473 100644 --- a/src/test/test_status.c +++ b/src/test/test_status.c @@ -613,6 +613,9 @@ NS_DECL(or_state_t *, get_or_state, (void)); NS_DECL(int, accounting_is_enabled, (const or_options_t *options)); NS_DECL(time_t, accounting_get_end_time, (void)); +static or_state_t * NS(mock_state) = NULL; +static or_options_t * NS(mock_options) = NULL; + static void NS(test_main)(void *arg) { @@ -652,6 +655,8 @@ NS(test_main)(void *arg) NS_UNMOCK(server_mode); NS_UNMOCK(accounting_is_enabled); NS_UNMOCK(accounting_get_end_time); + tor_free_(NS(mock_state)); + tor_free_(NS(mock_options)); } static double @@ -669,10 +674,10 @@ NS(we_are_hibernating)(void) static const or_options_t * NS(get_options)(void) { - or_options_t *mock_options = tor_malloc_zero(sizeof(or_options_t)); - mock_options->AccountingMax = 0; + NS(mock_options) = tor_malloc_zero(sizeof(or_options_t)); + NS(mock_options)->AccountingMax = 0; - return mock_options; + return NS(mock_options); } static int @@ -771,11 +776,11 @@ NS(accounting_get_end_time)(void) static or_state_t * NS(get_or_state)(void) { - or_state_t *mock_state = tor_malloc_zero(sizeof(or_state_t)); - mock_state->AccountingBytesReadInInterval = 0; - mock_state->AccountingBytesWrittenInInterval = 0; + NS(mock_state) = tor_malloc_zero(sizeof(or_state_t)); + NS(mock_state)->AccountingBytesReadInInterval = 0; + NS(mock_state)->AccountingBytesWrittenInInterval = 0; - return mock_state; + return NS(mock_state); } #undef NS_SUBMODULE

1 0

[tor/master] whitespace fix
by nickm＠torproject.org 01 May '14

01 May '14

commit 0e20825bf22bbe86dbd2a2822864b90ccc45c00b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 1 12:31:38 2014 -0400 whitespace fix --- src/or/statefile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/statefile.c b/src/or/statefile.c index a50eae5..7b9998f 100644 --- a/src/or/statefile.c +++ b/src/or/statefile.c @@ -636,7 +636,7 @@ or_state_free(or_state_t *state) { if (!state) return; - + config_free(&state_format, state); }

1 0

[tor/master] Changes file for valgrind fixes
by nickm＠torproject.org 01 May '14

01 May '14

commit 3866792cd04d95c80eb5dd1e7cb2fddf0c05f9b8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 29 12:53:19 2014 -0400 Changes file for valgrind fixes --- changes/bug11618 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug11618 b/changes/bug11618 new file mode 100644 index 0000000..e650d55 --- /dev/null +++ b/changes/bug11618 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Fix all valgrind warnings produced by the unit tests. There were + over a thousand memory leak warnings previously, mostly produced + by forgetting to free things in the unit test code. Fixes bug + 11618, bugfixes on many versions of Tor.

1 0

[tor/master] Merge remote-tracking branch 'public/valgrind_tests'
by nickm＠torproject.org 01 May '14

01 May '14

commit b51ce907771d3fbeeb2dcba3c109d3ee25850f4c Merge: b6c8a14 3866792 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 1 12:29:31 2014 -0400 Merge remote-tracking branch 'public/valgrind_tests' changes/bug11618 | 5 +++++ src/or/networkstatus.c | 3 ++- src/or/networkstatus.h | 4 ++++ src/or/statefile.c | 29 ++++++++++++++++++++++------- src/or/statefile.h | 2 ++ src/test/test.c | 24 ++++++++++++++++++------ src/test/test_buffers.c | 1 + src/test/test_config.c | 18 ++++++++++++++---- src/test/test_controller_events.c | 21 +++++++++++++++------ src/test/test_dir.c | 17 +++++++++++------ src/test/test_extorport.c | 1 + src/test/test_microdesc.c | 1 + src/test/test_oom.c | 11 +++++++++++ src/test/test_policy.c | 2 ++ src/test/test_pt.c | 17 ++++++++++++++++- src/test/test_routerkeys.c | 1 + src/test/test_status.c | 19 ++++++++++++------- src/test/test_util.c | 5 +++++ 18 files changed, 143 insertions(+), 38 deletions(-)

1 0

[tor/master] Fix memory leak in test_onion_queues
by nickm＠torproject.org 01 May '14

01 May '14

commit 1cf02605d4819f200ac70df6ea6c75cfd1ef14e5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Apr 26 00:11:17 2014 -0400 Fix memory leak in test_onion_queues --- src/test/test.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/test/test.c b/src/test/test.c index f1486e9..9bceab5 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -418,9 +418,10 @@ test_onion_queues(void) or_circuit_t *circ1 = or_circuit_new(0, NULL); or_circuit_t *circ2 = or_circuit_new(0, NULL); - create_cell_t *onionskin = NULL; + create_cell_t *onionskin = NULL, *create2_ptr; create_cell_t *create1 = tor_malloc_zero(sizeof(create_cell_t)); create_cell_t *create2 = tor_malloc_zero(sizeof(create_cell_t)); + create2_ptr = create2; /* remember, but do not free */ create_cell_init(create1, CELL_CREATE, ONION_HANDSHAKE_TYPE_TAP, TAP_ONIONSKIN_CHALLENGE_LEN, buf1); @@ -440,6 +441,7 @@ test_onion_queues(void) test_eq_ptr(circ2, onion_next_task(&onionskin)); test_eq(1, onion_num_pending(ONION_HANDSHAKE_TYPE_TAP)); test_eq(0, onion_num_pending(ONION_HANDSHAKE_TYPE_NTOR)); + tt_ptr_op(onionskin, ==, create2_ptr); clear_pending_onions(); test_eq(0, onion_num_pending(ONION_HANDSHAKE_TYPE_TAP)); @@ -450,6 +452,7 @@ test_onion_queues(void) circuit_free(TO_CIRCUIT(circ2)); tor_free(create1); tor_free(create2); + tor_free(onionskin); } static void

1 0

[tor/master] Fix memory leaks in test_circuit_timeout
by nickm＠torproject.org 01 May '14

01 May '14

commit c7951731ed1bcc06d1eb404bd699cc0e0392e626 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Apr 26 00:10:04 2014 -0400 Fix memory leaks in test_circuit_timeout Found with valgrind. --- src/or/statefile.c | 29 ++++++++++++++++++++++------- src/or/statefile.h | 2 ++ src/test/test.c | 16 +++++++++++----- 3 files changed, 35 insertions(+), 12 deletions(-) diff --git a/src/or/statefile.c b/src/or/statefile.c index da31341..a50eae5 100644 --- a/src/or/statefile.c +++ b/src/or/statefile.c @@ -294,6 +294,16 @@ or_state_save_broken(char *fname) tor_free(fname2); } +STATIC or_state_t * +or_state_new(void) +{ + or_state_t *new_state = tor_malloc_zero(sizeof(or_state_t)); + new_state->magic_ = OR_STATE_MAGIC; + config_init(&state_format, new_state); + + return new_state; +} + /** Reload the persistent state from disk, generating a new state as needed. * Return 0 on success, less than 0 on failure. */ @@ -321,9 +331,7 @@ or_state_load(void) log_warn(LD_GENERAL,"State file \"%s\" is not a file? Failing.", fname); goto done; } - new_state = tor_malloc_zero(sizeof(or_state_t)); - new_state->magic_ = OR_STATE_MAGIC; - config_init(&state_format, new_state); + new_state = or_state_new(); if (contents) { config_line_t *lines=NULL; int assign_retval; @@ -358,9 +366,7 @@ or_state_load(void) tor_free(contents); config_free(&state_format, new_state); - new_state = tor_malloc_zero(sizeof(or_state_t)); - new_state->magic_ = OR_STATE_MAGIC; - config_init(&state_format, new_state); + new_state = or_state_new(); } else if (contents) { log_info(LD_GENERAL, "Loaded state from \"%s\"", fname); } else { @@ -625,10 +631,19 @@ save_transport_to_state(const char *transport, tor_free(transport_addrport); } +STATIC void +or_state_free(or_state_t *state) +{ + if (!state) + return; + + config_free(&state_format, state); +} + void or_state_free_all(void) { - config_free(&state_format, global_state); + or_state_free(global_state); global_state = NULL; } diff --git a/src/or/statefile.h b/src/or/statefile.h index c1413ff..15bb0b4 100644 --- a/src/or/statefile.h +++ b/src/or/statefile.h @@ -20,6 +20,8 @@ void or_state_free_all(void); #ifdef STATEFILE_PRIVATE STATIC config_line_t *get_transport_in_state_by_name(const char *transport); +STATIC void or_state_free(or_state_t *state); +STATIC or_state_t *or_state_new(void); #endif #endif diff --git a/src/test/test.c b/src/test/test.c index 771725e..f1486e9 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -32,6 +32,7 @@ const char tor_git_revision[] = ""; #define ROUTER_PRIVATE #define CIRCUITSTATS_PRIVATE #define CIRCUITLIST_PRIVATE +#define STATEFILE_PRIVATE /* * Linux doesn't provide lround in math.h by default, but mac os does... @@ -59,6 +60,7 @@ double fabs(double x); #include "policies.h" #include "rephist.h" #include "routerparse.h" +#include "statefile.h" #ifdef CURVE25519_ENABLED #include "crypto_curve25519.h" #include "onion_ntor.h" @@ -466,14 +468,14 @@ test_circuit_timeout(void) circuit_build_times_t estimate; circuit_build_times_t final; double timeout1, timeout2; - or_state_t state; + or_state_t *state=NULL; int i, runs; double close_ms; circuit_build_times_init(&initial); circuit_build_times_init(&estimate); circuit_build_times_init(&final); - memset(&state, 0, sizeof(or_state_t)); + state = or_state_new(); circuitbuild_running_unit_tests(); #define timeout0 (build_time_t)(30*1000.0) @@ -505,8 +507,9 @@ test_circuit_timeout(void) test_assert(estimate.total_build_times <= CBT_NCIRCUITS_TO_OBSERVE); - circuit_build_times_update_state(&estimate, &state); - test_assert(circuit_build_times_parse_state(&final, &state) == 0); + circuit_build_times_update_state(&estimate, state); + circuit_build_times_free_timeouts(&final); + test_assert(circuit_build_times_parse_state(&final, state) == 0); circuit_build_times_update_alpha(&final); timeout2 = circuit_build_times_calculate_timeout(&final, @@ -595,7 +598,10 @@ test_circuit_timeout(void) } done: - return; + circuit_build_times_free_timeouts(&initial); + circuit_build_times_free_timeouts(&estimate); + circuit_build_times_free_timeouts(&final); + or_state_free(state); } /** Test encoding and parsing of rendezvous service descriptors. */

1 0

[tor/master] fix uninitialized memory reads from test_geoip_with_pt. Found with valgrind
by nickm＠torproject.org 01 May '14

01 May '14

commit 3fa296ce28ea875877ac2725dfd213e176881964 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Apr 26 00:12:16 2014 -0400 fix uninitialized memory reads from test_geoip_with_pt. Found with valgrind --- src/test/test.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/test.c b/src/test/test.c index f7e26a6..c96b396 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1018,6 +1018,8 @@ test_geoip_with_pt(void) get_options_mutable()->BridgeRelay = 1; get_options_mutable()->BridgeRecordUsageByCountry = 1; + memset(&in6, 0, sizeof(in6)); + /* No clients seen yet. */ s = geoip_get_transport_history(); tor_assert(!s);

1 0

[tor/master] Fix memory leak in test_geoip
by nickm＠torproject.org 01 May '14

01 May '14

commit fa202c4127a7fb0769166cb43757d3fbc8726fc8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Apr 26 00:11:46 2014 -0400 Fix memory leak in test_geoip --- src/test/test.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/test.c b/src/test/test.c index 9bceab5..f7e26a6 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -955,6 +955,7 @@ test_geoip(void) geoip_start_dirreq((uint64_t) 1, 1024, DIRREQ_TUNNELED); s = geoip_format_dirreq_stats(now + 86400); test_streq(dirreq_stats_4, s); + tor_free(s); /* Stop collecting directory request statistics and start gathering * entry stats. */

1 0