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

[tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 29 Jun '18

29 Jun '18

commit ed84dab8b4cd691dcdc0fecfb9c451bb0ffd930a Merge: 6e9d5fc4e a3ec89a4f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 13:49:43 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 src/test/test_channelpadding.c | 1 + src/test/test_hs_descriptor.c | 3 +++ src/test/test_shared_random.c | 1 + 3 files changed, 5 insertions(+) diff --cc src/test/test_hs_descriptor.c index a5e9b9667,a40616c61..897b44188 --- a/src/test/test_hs_descriptor.c +++ b/src/test/test_hs_descriptor.c @@@ -196,18 -195,19 +196,19 @@@ test_link_specifier(void *arg /* Decode it and validate the format. */ ret = base64_decode(buf, sizeof(buf), b64, strlen(b64)); - tt_int_op(ret, >, 0); + tt_int_op(ret, OP_GT, 0); /* First byte is the number of link specifier. */ - tt_int_op(get_uint8(buf), ==, 1); + tt_int_op(get_uint8(buf), OP_EQ, 1); ret = link_specifier_parse(&ls, (uint8_t *) buf + 1, ret - 1); - tt_int_op(ret, ==, 8); + tt_int_op(ret, OP_EQ, 8); /* Should be 2 bytes for port and 4 bytes for IPv4. */ - tt_int_op(link_specifier_get_ls_len(ls), ==, 6); + tt_int_op(link_specifier_get_ls_len(ls), OP_EQ, 6); ipv4 = link_specifier_get_un_ipv4_addr(ls); - tt_int_op(tor_addr_to_ipv4h(&spec.u.ap.addr), ==, ipv4); - tt_int_op(link_specifier_get_un_ipv4_port(ls), ==, spec.u.ap.port); + tt_int_op(tor_addr_to_ipv4h(&spec.u.ap.addr), OP_EQ, ipv4); + tt_int_op(link_specifier_get_un_ipv4_port(ls), OP_EQ, spec.u.ap.port); link_specifier_free(ls); + ls = NULL; tor_free(b64); } @@@ -233,11 -233,11 +234,12 @@@ for (unsigned int i = 0; i < sizeof(ipv6); i++) { ipv6[i] = link_specifier_get_un_ipv6_addr(ls, i); } - tt_mem_op(tor_addr_to_in6_addr8(&spec.u.ap.addr), ==, ipv6, sizeof(ipv6)); - tt_int_op(link_specifier_get_un_ipv6_port(ls), ==, spec.u.ap.port); + tt_mem_op(tor_addr_to_in6_addr8(&spec.u.ap.addr), OP_EQ, ipv6, + sizeof(ipv6)); + tt_int_op(link_specifier_get_un_ipv6_port(ls), OP_EQ, spec.u.ap.port); link_specifier_free(ls); + ls = NULL; tor_free(b64); }

1 0

[tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 29 Jun '18

29 Jun '18

commit a3ec89a4f8a6222403697b7f7fce5d5138b79994 Merge: d583459d5 3c0a63c40 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 13:49:43 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 src/test/test_shared_random.c | 1 + 1 file changed, 1 insertion(+)

1 0

[tor/release-0.3.3] Fix some memory errors in the recent coverity fixes.
by nickm＠torproject.org 29 Jun '18

29 Jun '18

commit d583459d5845378a2b9ac0174ebe67a7473932fb Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 13:48:36 2018 -0400 Fix some memory errors in the recent coverity fixes. Found by asan on travis :/ --- src/test/test_channelpadding.c | 1 + src/test/test_hs_descriptor.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/test/test_channelpadding.c b/src/test/test_channelpadding.c index 0bc9699fe..d399738ce 100644 --- a/src/test/test_channelpadding.c +++ b/src/test/test_channelpadding.c @@ -677,6 +677,7 @@ test_channelpadding_consensus(void *arg) memcpy(relay->identity_digest, ((channel_tls_t *)chan)->conn->identity_digest, DIGEST_LEN); smartlist_add(current_md_consensus->routerstatus_list, relay); + relay = NULL; /* Prevent double-free */ tried_to_write_cell = 0; decision = channelpadding_decide_to_pad_channel(chan); diff --git a/src/test/test_hs_descriptor.c b/src/test/test_hs_descriptor.c index 45850ada4..a40616c61 100644 --- a/src/test/test_hs_descriptor.c +++ b/src/test/test_hs_descriptor.c @@ -207,6 +207,7 @@ test_link_specifier(void *arg) tt_int_op(link_specifier_get_un_ipv4_port(ls), ==, spec.u.ap.port); link_specifier_free(ls); + ls = NULL; tor_free(b64); } @@ -236,6 +237,7 @@ test_link_specifier(void *arg) tt_int_op(link_specifier_get_un_ipv6_port(ls), ==, spec.u.ap.port); link_specifier_free(ls); + ls = NULL; tor_free(b64); } @@ -263,6 +265,7 @@ test_link_specifier(void *arg) tt_mem_op(spec.u.legacy_id, OP_EQ, id, DIGEST_LEN); link_specifier_free(ls); + ls = NULL; tor_free(b64); }

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 29 Jun '18

29 Jun '18

commit 36c372581f8d7651c336f69b9b1b051d3d31d548 Merge: 92b4996b2 ed84dab8b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 13:49:43 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 src/test/test_channelpadding.c | 1 + src/test/test_hs_descriptor.c | 3 +++ src/test/test_shared_random.c | 1 + 3 files changed, 5 insertions(+)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 29 Jun '18

29 Jun '18

commit a814ed0192d9f11182c996d5833ea5543e6326b3 Merge: 739cd6ec2 36c372581 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 13:49:43 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 src/test/test_channelpadding.c | 1 + src/test/test_hs_descriptor.c | 3 +++ src/test/test_shared_random.c | 1 + 3 files changed, 5 insertions(+)

1 0

[tor/maint-0.3.2] Fix memory leak in pick_hsdir_v3().
by nickm＠torproject.org 29 Jun '18

29 Jun '18

commit ce5d055ed7e4d8e5d1c0b0b922738c87b6a8da1c Author: Alexander Færøy <ahf(a)torproject.org> Date: Sat Jun 23 03:40:32 2018 +0200 Fix memory leak in pick_hsdir_v3(). This patch fixes a memory leak in pick_hsdir_v3() where we might return early, but forgot to free the responsible_hsdirs variable. We solve this by not allocating storage for responsible_hsdirs until it's actually needed. See: Coverity CID 1437449 --- src/or/hs_client.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/hs_client.c b/src/or/hs_client.c index 551cf5055..4e2824c13 100644 --- a/src/or/hs_client.c +++ b/src/or/hs_client.c @@ -365,14 +365,12 @@ pick_hsdir_v3(const ed25519_public_key_t *onion_identity_pk) int retval; char base64_blinded_pubkey[ED25519_BASE64_LEN + 1]; uint64_t current_time_period = hs_get_time_period_num(0); - smartlist_t *responsible_hsdirs; + smartlist_t *responsible_hsdirs = NULL; ed25519_public_key_t blinded_pubkey; routerstatus_t *hsdir_rs = NULL; tor_assert(onion_identity_pk); - responsible_hsdirs = smartlist_new(); - /* Get blinded pubkey of hidden service */ hs_build_blinded_pubkey(onion_identity_pk, NULL, 0, current_time_period, &blinded_pubkey); @@ -383,6 +381,8 @@ pick_hsdir_v3(const ed25519_public_key_t *onion_identity_pk) } /* Get responsible hsdirs of service for this time period */ + responsible_hsdirs = smartlist_new(); + hs_get_responsible_hsdirs(&blinded_pubkey, current_time_period, 0, 1, responsible_hsdirs);

1 0

[tor/maint-0.3.2] Merge remote-tracking branch 'ahf-github/maint-0.3.2' into maint-0.3.2
by nickm＠torproject.org 29 Jun '18

29 Jun '18

commit 6e9d5fc4ec40136d173be680a85a9bfb9b99fea4 Merge: 68dfbd5ef a2e623f63 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 13:07:07 2018 -0400 Merge remote-tracking branch 'ahf-github/maint-0.3.2' into maint-0.3.2 src/or/hs_client.c | 6 +++--- src/test/test_hs_common.c | 7 ++++++- src/test/test_hs_intropoint.c | 7 +++++++ 3 files changed, 16 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.3.2] Fix memory leak in helper_add_hsdir_to_networkstatus().
by nickm＠torproject.org 29 Jun '18

29 Jun '18

commit a2e623f631a63f041f76b79e554b01bbf62748b8 Author: Alexander Færøy <ahf(a)torproject.org> Date: Sat Jun 23 13:05:41 2018 +0200 Fix memory leak in helper_add_hsdir_to_networkstatus(). This patch fixes a memory leak in helper_add_hsdir_to_networkstatus() where the rs object might not get properly freed. See: Coverity CID 1437427. --- src/test/test_hs_common.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c index 21daa58ab..3ae623ed0 100644 --- a/src/test/test_hs_common.c +++ b/src/test/test_hs_common.c @@ -284,6 +284,7 @@ helper_add_hsdir_to_networkstatus(networkstatus_t *ns, routerinfo_t *ri = tor_malloc_zero(sizeof(routerinfo_t)); uint8_t identity[DIGEST_LEN]; tor_addr_t ipv4_addr; + node_t *node = NULL; memset(identity, identity_idx, sizeof(identity)); @@ -302,7 +303,8 @@ helper_add_hsdir_to_networkstatus(networkstatus_t *ns, memset(&ri->cache_info.signing_key_cert->signing_key, identity_idx, ED25519_PUBKEY_LEN); tt_assert(nodelist_set_routerinfo(ri, NULL)); - node_t *node = node_get_mutable_by_id(ri->cache_info.identity_digest); + + node = node_get_mutable_by_id(ri->cache_info.identity_digest); tt_assert(node); node->rs = rs; /* We need this to exist for node_has_descriptor() to return true. */ @@ -314,6 +316,9 @@ helper_add_hsdir_to_networkstatus(networkstatus_t *ns, smartlist_add(ns->routerstatus_list, rs); done: + if (node == NULL) + routerstatus_free(rs); + routerinfo_free(ri); }

1 0

[tor/maint-0.3.2] Fix memory leak in new_establish_intro_cell().
by nickm＠torproject.org 29 Jun '18

29 Jun '18

commit 8e805bf0f65ffd137a6c9ed89be060e5d9ba317d Author: Alexander Færøy <ahf(a)torproject.org> Date: Sat Jun 23 10:48:42 2018 +0200 Fix memory leak in new_establish_intro_cell(). This patch fixes a memory leak in new_establish_intro_cell() that could happen if a test assertion fails and the *cell_out value isn't properly free'd. See: Coverity CID 1437445 --- src/test/test_hs_intropoint.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/test/test_hs_intropoint.c b/src/test/test_hs_intropoint.c index 0cae2de7e..b2d2700f8 100644 --- a/src/test/test_hs_intropoint.c +++ b/src/test/test_hs_intropoint.c @@ -43,6 +43,10 @@ new_establish_intro_cell(const char *circ_nonce, trn_cell_establish_intro_t *cell = NULL; hs_service_intro_point_t *ip = NULL; + /* Ensure that *cell_out is NULL such that we can use to check if we need to + * free `cell` in case of an error. */ + *cell_out = NULL; + /* Auth key pair is generated in the constructor so we are all set for * using this IP object. */ ip = service_intro_point_new(NULL, 0); @@ -56,6 +60,9 @@ new_establish_intro_cell(const char *circ_nonce, *cell_out = cell; done: + if (*cell_out == NULL) + trn_cell_establish_intro_free(cell); + service_intro_point_free(ip); return cell_len; }

1 0

[tor/maint-0.3.3] Fix memory leak in new_establish_intro_cell().
by nickm＠torproject.org 29 Jun '18

29 Jun '18

commit 8e805bf0f65ffd137a6c9ed89be060e5d9ba317d Author: Alexander Færøy <ahf(a)torproject.org> Date: Sat Jun 23 10:48:42 2018 +0200 Fix memory leak in new_establish_intro_cell(). This patch fixes a memory leak in new_establish_intro_cell() that could happen if a test assertion fails and the *cell_out value isn't properly free'd. See: Coverity CID 1437445 --- src/test/test_hs_intropoint.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/test/test_hs_intropoint.c b/src/test/test_hs_intropoint.c index 0cae2de7e..b2d2700f8 100644 --- a/src/test/test_hs_intropoint.c +++ b/src/test/test_hs_intropoint.c @@ -43,6 +43,10 @@ new_establish_intro_cell(const char *circ_nonce, trn_cell_establish_intro_t *cell = NULL; hs_service_intro_point_t *ip = NULL; + /* Ensure that *cell_out is NULL such that we can use to check if we need to + * free `cell` in case of an error. */ + *cell_out = NULL; + /* Auth key pair is generated in the constructor so we are all set for * using this IP object. */ ip = service_intro_point_new(NULL, 0); @@ -56,6 +60,9 @@ new_establish_intro_cell(const char *circ_nonce, *cell_out = cell; done: + if (*cell_out == NULL) + trn_cell_establish_intro_free(cell); + service_intro_point_free(ip); return cell_len; }

1 0