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

[tor/master] 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/master] 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/master] 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/master] 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.2.9] Fix potential memory leak in test_hs_auth_cookies().
by nickm＠torproject.org 29 Jun '18

29 Jun '18

commit 1724f995c71502977c79343922ab50fc2403284f Author: Alexander Færøy <ahf(a)torproject.org> Date: Sat Jun 23 03:17:09 2018 +0200 Fix potential memory leak in test_hs_auth_cookies(). This patch fixes a potential memory leak in test_hs_auth_cookies() if a test-case fails and we goto the done label where no memory clean up is done. See: Coverity CID 1437453 --- src/test/test_hs.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/test/test_hs.c b/src/test/test_hs.c index 8237bbc50..d572dd8d2 100644 --- a/src/test/test_hs.c +++ b/src/test/test_hs.c @@ -446,10 +446,10 @@ test_hs_auth_cookies(void *arg) #define TEST_COOKIE_ENCODED_STEALTH "YWJjZGVmZ2hpamtsbW5vcB" #define TEST_COOKIE_ENCODED_INVALID "YWJjZGVmZ2hpamtsbW5vcD" - char *encoded_cookie; + char *encoded_cookie = NULL; uint8_t raw_cookie[REND_DESC_COOKIE_LEN]; rend_auth_type_t auth_type; - char *err_msg; + char *err_msg = NULL; int re; (void)arg; @@ -495,6 +495,9 @@ test_hs_auth_cookies(void *arg) tor_free(err_msg); done: + tor_free(encoded_cookie); + tor_free(err_msg); + return; }

1 0

[tor/release-0.2.9] Fix memory leak in frac_nodes_with_descriptors().
by nickm＠torproject.org 29 Jun '18

29 Jun '18

commit dcbfee246f35970f65d08a4555e25b956b9aba9c Author: Alexander Færøy <ahf(a)torproject.org> Date: Sat Jun 23 03:24:10 2018 +0200 Fix memory leak in frac_nodes_with_descriptors(). This patch fixes a memory leak in frac_nodes_with_descriptors() where we might return without free'ing the bandwidths variable. See: Coverity CID 1437451. --- src/or/routerlist.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index f21a222cd..f73ec9baa 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2765,6 +2765,8 @@ frac_nodes_with_descriptors(const smartlist_t *sl, if (node_has_descriptor(node)) n_with_descs++; }); + + tor_free(bandwidths); return ((double)n_with_descs) / (double)smartlist_len(sl); }

1 0

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

29 Jun '18

commit f6b30a97a96837e012b296a43cc99018d96bcf13 Merge: 5ab23e03f f82f8179e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 13:06:15 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 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(-)

1 0

[tor/master] Merge branch 'maint-0.3.4'
by nickm＠torproject.org 29 Jun '18

29 Jun '18

commit 7a47379f252b4d277df7c289f8a9d3160b50eee0 Merge: 1a5be3c5e f6b30a97a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 13:06:16 2018 -0400 Merge branch 'maint-0.3.4' 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(-)

1 0

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

29 Jun '18

commit f82f8179e65c5e0021da46fd24e4bd7d8126d8f7 Merge: df896ed63 68dfbd5ef Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 13:06:15 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 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(-)

1 0

[tor/release-0.2.9] Fix memory leak in disk_state_parse_commits().
by nickm＠torproject.org 29 Jun '18

29 Jun '18

commit 3395de51a01aa5519c52404ed2bb9c8cda3571c9 Author: Alexander Færøy <ahf(a)torproject.org> Date: Sat Jun 23 11:28:00 2018 +0200 Fix memory leak in disk_state_parse_commits(). This patch fixes a memory leak in disk_state_parse_commits() where if commit is NULL, we continue the internal loop, but without ever freeing the args variable. See: Coverity CID 1437441. --- src/or/shared_random_state.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/or/shared_random_state.c b/src/or/shared_random_state.c index 87db9031e..8438d4640 100644 --- a/src/or/shared_random_state.c +++ b/src/or/shared_random_state.c @@ -409,6 +409,7 @@ disk_state_parse_commits(sr_state_t *state, if (commit == NULL) { /* Ignore badly formed commit. It could also be a authority * fingerprint that we don't know about so it shouldn't be used. */ + smartlist_free(args); continue; } /* We consider parseable commit from our disk state to be valid because

1 0