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

[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 1385a5118d55edd3dd672eeb793b662853f30758 Merge: d6d3f8486 b426e83f0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 13:00:56 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 src/or/routerlist.c | 2 ++ src/or/shared_random_state.c | 1 + src/test/test_hs.c | 7 +++++-- src/test/test_shared_random.c | 1 + 4 files changed, 9 insertions(+), 2 deletions(-)

1 0

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

29 Jun '18

commit b426e83f077d57e14fc77ebae18a3637bb2c752a Merge: fcd26af7c 8ec6b36dc Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 13:00:52 2018 -0400 Merge remote-tracking branch 'ahf-github/maint-0.2.9' into maint-0.2.9 src/or/routerlist.c | 2 ++ src/or/shared_random_state.c | 1 + src/test/test_hs.c | 7 +++++-- src/test/test_shared_random.c | 1 + 4 files changed, 9 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.3] Changes file for 26467
by nickm＠torproject.org 29 Jun '18

29 Jun '18

commit 890bc15ab641f1c22a39b9a86de656a4e3a2d225 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 13:04:29 2018 -0400 Changes file for 26467 --- changes/ticket26467 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket26467 b/changes/ticket26467 new file mode 100644 index 000000000..45883786c --- /dev/null +++ b/changes/ticket26467 @@ -0,0 +1,3 @@ + o Minor bugfixes (memory, correctness): + - Fix a number of small memory leaks identified by coverity. Fixes + bug 26467; bugfix on numerous Tor versions.

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 df896ed6323f6f0493393f97e739501df8092e7f Merge: f8dad5a07 fe2588a5a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 13:00:56 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 src/or/routerlist.c | 2 ++ src/or/shared_random_state.c | 1 + src/test/test_hs.c | 7 +++++-- src/test/test_shared_random.c | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) diff --cc src/or/routerlist.c index 1bfbd9f67,95b39d357..203895c86 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@@ -2758,9 -2755,11 +2758,11 @@@ frac_nodes_with_descriptors(const smart total <= 0.0) { int n_with_descs = 0; SMARTLIST_FOREACH(sl, const node_t *, node, { - if (node_has_descriptor(node)) + if (node_has_any_descriptor(node)) n_with_descs++; }); + + tor_free(bandwidths); return ((double)n_with_descs) / (double)smartlist_len(sl); }

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 fe2588a5a8560c8cb03345b3caaaf906655c34a1 Merge: 25226fb26 1385a5118 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 13:00:56 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 src/or/routerlist.c | 2 ++ src/or/shared_random_state.c | 1 + src/test/test_hs.c | 7 +++++-- src/test/test_shared_random.c | 1 + 4 files changed, 9 insertions(+), 2 deletions(-)

1 0

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

29 Jun '18

commit 419077c26da1e50ed5671c69ec446a3eb60a8303 Merge: 1385a5118 8550016e6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 13:06:08 2018 -0400 Merge remote-tracking branch 'ahf-github/maint-0.3.1' into maint-0.3.1 src/or/directory.c | 1 + src/test/hs_test_helpers.c | 6 ++++++ src/test/test_channelpadding.c | 2 ++ 3 files changed, 9 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 0f85e059b7e90cdfdb9b130b811e552107fdee38 Merge: 63cddead3 df896ed63 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 13:00:56 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 src/or/routerlist.c | 2 ++ src/or/shared_random_state.c | 1 + src/test/test_hs.c | 7 +++++-- src/test/test_shared_random.c | 1 + 4 files changed, 9 insertions(+), 2 deletions(-)

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 ea14d3408df7c846722b54484cf5b8d61de5384f Merge: b89a66e99 890bc15ab Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 13:06:15 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/ticket26467 | 3 +++ 1 file changed, 3 insertions(+)

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 68dfbd5ef433b830059baa08d48589518db05d22 Merge: fe2588a5a ea14d3408 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 13:06:15 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/ticket26467 | 3 +++ src/or/directory.c | 1 + src/or/hs_descriptor.c | 1 + src/test/hs_test_helpers.c | 6 ++++++ src/test/test_channelpadding.c | 2 ++ src/test/test_hs_descriptor.c | 11 +++++------ 6 files changed, 18 insertions(+), 6 deletions(-) diff --cc src/or/hs_descriptor.c index fef0607c1,8e10c0fff..582ac9cb7 --- a/src/or/hs_descriptor.c +++ b/src/or/hs_descriptor.c @@@ -1115,16 -1133,8 +1115,17 @@@ decode_link_specifiers(const char *enco memcpy(hs_spec->u.legacy_id, link_specifier_getarray_un_legacy_id(ls), sizeof(hs_spec->u.legacy_id)); break; + case LS_ED25519_ID: + /* Both are known at compile time so let's make sure they are the same + * else we can copy memory out of bound. */ + tor_assert(link_specifier_getlen_un_ed25519_id(ls) == + sizeof(hs_spec->u.ed25519_id)); + memcpy(hs_spec->u.ed25519_id, + link_specifier_getconstarray_un_ed25519_id(ls), + sizeof(hs_spec->u.ed25519_id)); + break; default: + tor_free(hs_spec); goto err; }

1 0

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

29 Jun '18

commit b89a66e9975dec4531c5443744f19b8105b4086a Merge: 419077c26 c997d49ad Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 13:06:11 2018 -0400 Merge remote-tracking branch 'ahf-github/maint-0.3.0' into maint-0.3.1 src/or/hs_descriptor.c | 1 + src/test/test_hs_descriptor.c | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-)

1 0