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

[tor/release-0.3.1] 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.1] Fix a memory error in test_shared_random
by nickm＠torproject.org 29 Jun '18

29 Jun '18

commit 3c0a63c40f8f41742bf6a4ab58165e8f25aab34a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 13:49:02 2018 -0400 Fix a memory error in test_shared_random Bug not in any released Tor. --- src/test/test_shared_random.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c index 5f86d783a..6a8c1abaf 100644 --- a/src/test/test_shared_random.c +++ b/src/test/test_shared_random.c @@ -780,6 +780,7 @@ test_sr_setup_commits(void) /* Now during REVEAL phase save commit D by restoring its reveal. */ set_sr_phase(SR_PHASE_REVEAL); save_commit_to_state(place_holder); + place_holder = NULL; tt_str_op(commit_d->encoded_reveal, OP_EQ, "DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD"); /* Go back to an empty encoded reveal value. */

1 0

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

29 Jun '18

commit 1d43779960cb02d3bd176207044c97a80696dd55 Merge: fc5242889 a3ec89a4f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 13:49:43 2018 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 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.1] 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.2] 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.2] Fix a memory error in test_shared_random
by nickm＠torproject.org 29 Jun '18

29 Jun '18

commit 3c0a63c40f8f41742bf6a4ab58165e8f25aab34a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 13:49:02 2018 -0400 Fix a memory error in test_shared_random Bug not in any released Tor. --- src/test/test_shared_random.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c index 5f86d783a..6a8c1abaf 100644 --- a/src/test/test_shared_random.c +++ b/src/test/test_shared_random.c @@ -780,6 +780,7 @@ test_sr_setup_commits(void) /* Now during REVEAL phase save commit D by restoring its reveal. */ set_sr_phase(SR_PHASE_REVEAL); save_commit_to_state(place_holder); + place_holder = NULL; tt_str_op(commit_d->encoded_reveal, OP_EQ, "DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD"); /* Go back to an empty encoded reveal value. */

1 0

[tor/release-0.3.2] 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.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 29 Jun '18

29 Jun '18

commit 71bcba4704bbf20bf4676e35a0c3cfa9b8bc4df6 Merge: fcfe16197 ed84dab8b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 13:49:43 2018 -0400 Merge branch 'maint-0.3.2' into release-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(+)

1 0

[tor/release-0.3.3] Fix a memory error in test_shared_random
by nickm＠torproject.org 29 Jun '18

29 Jun '18

commit 3c0a63c40f8f41742bf6a4ab58165e8f25aab34a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 13:49:02 2018 -0400 Fix a memory error in test_shared_random Bug not in any released Tor. --- src/test/test_shared_random.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c index 5f86d783a..6a8c1abaf 100644 --- a/src/test/test_shared_random.c +++ b/src/test/test_shared_random.c @@ -780,6 +780,7 @@ test_sr_setup_commits(void) /* Now during REVEAL phase save commit D by restoring its reveal. */ set_sr_phase(SR_PHASE_REVEAL); save_commit_to_state(place_holder); + place_holder = NULL; tt_str_op(commit_d->encoded_reveal, OP_EQ, "DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD"); /* Go back to an empty encoded reveal value. */

1 0

[tor/release-0.3.3] 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