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

[tor/master] Fix potential memory leak in hs_helper_build_hs_desc_impl().
by nickm＠torproject.org 29 Jun '18

29 Jun '18

commit dc2384da30cae716f512dedef37d27f00c43f29d Author: Alexander Færøy <ahf(a)torproject.org> Date: Sat Jun 23 10:27:10 2018 +0200 Fix potential memory leak in hs_helper_build_hs_desc_impl(). This patch fixes a memory leak in hs_helper_build_hs_desc_impl() where if a test assertion would fail we would leak the storage that `desc` points to. See: Coverity CID 1437448 --- src/test/hs_test_helpers.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/test/hs_test_helpers.c b/src/test/hs_test_helpers.c index f7e054b1d..dcd58bc5f 100644 --- a/src/test/hs_test_helpers.c +++ b/src/test/hs_test_helpers.c @@ -142,6 +142,9 @@ hs_helper_build_hs_desc_impl(unsigned int no_ip, descp = desc; done: + if (descp == NULL) + tor_free(desc); + return descp; }

1 0

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

29 Jun '18

commit 1a5be3c5e76a9ce07c64499b6cb8a6bad9323113 Merge: 9d5b815dc 5ab23e03f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 13:03:00 2018 -0400 Merge branch 'maint-0.3.4' src/or/dirauth/shared_random_state.c | 1 + src/or/routerlist.c | 1 + src/test/test_hs.c | 7 +++++-- src/test/test_shared_random.c | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) diff --cc src/or/routerlist.c index 68fd76344,97d83213a..98e1f69bb --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@@ -2781,9 -2761,10 +2781,10 @@@ frac_nodes_with_descriptors(const smart total <= 0.0) { int n_with_descs = 0; SMARTLIST_FOREACH(sl, const node_t *, node, { - if (node_has_any_descriptor(node)) + if (node_has_preferred_descriptor(node, for_direct_conn)) n_with_descs++; }); + tor_free(bandwidths); return ((double)n_with_descs) / smartlist_len(sl); }

1 0

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

29 Jun '18

commit 8550016e6f5e2780259f5073e34e67708e4e87ff Author: Alexander Færøy <ahf(a)torproject.org> Date: Sat Jun 23 12:52:04 2018 +0200 Fix memory leak in test_channelpadding_consensus(). The relay variable is always allocated, but might not be freed before we return from this function. See: Coverity CID 1437431 --- src/test/test_channelpadding.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/test_channelpadding.c b/src/test/test_channelpadding.c index d54c9cc52..0bc9699fe 100644 --- a/src/test/test_channelpadding.c +++ b/src/test/test_channelpadding.c @@ -745,6 +745,8 @@ test_channelpadding_consensus(void *arg) tt_i64_op(val, OP_LE, 24*60*60*2); done: + tor_free(relay); + free_mock_consensus(); free_fake_channeltls((channel_tls_t*)chan); smartlist_free(connection_array);

1 0

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

29 Jun '18

commit d86c45bf5cc75a526b884a754d72ef4d11aa0693 Author: Alexander Færøy <ahf(a)torproject.org> Date: Sat Jun 23 10:33:40 2018 +0200 Fix memory leak in client_likes_consensus(). This patches fixes a memory leak in client_likes_consensus() where if consensus_cache_entry_get_voter_id_digests() would fail we would return without having free'd the voters list. See: Coverity CID 1437447 --- src/or/directory.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/or/directory.c b/src/or/directory.c index 5ceea2fb3..f52354356 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3499,6 +3499,7 @@ client_likes_consensus(const struct consensus_cache_entry_t *ent, int have = 0; if (consensus_cache_entry_get_voter_id_digests(ent, voters) != 0) { + smartlist_free(voters); return 1; // We don't know the voters; assume the client won't mind. */ }

1 0

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

[tor/master] Fix memory link in test_link_specifier().
by nickm＠torproject.org 29 Jun '18

29 Jun '18

commit c997d49ad6e6a360323311444eed1dbee785aea4 Author: Alexander Færøy <ahf(a)torproject.org> Date: Sat Jun 23 12:39:20 2018 +0200 Fix memory link in test_link_specifier(). This patch fixes a memory leak in test_link_specifier() where ls might not get freed in case one of the test macros fails. See: Coverity CID 1437434. --- src/test/test_hs_descriptor.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/test/test_hs_descriptor.c b/src/test/test_hs_descriptor.c index 97fe1910b..365683e75 100644 --- a/src/test/test_hs_descriptor.c +++ b/src/test/test_hs_descriptor.c @@ -376,6 +376,9 @@ test_link_specifier(void *arg) ssize_t ret; hs_desc_link_specifier_t spec; smartlist_t *link_specifiers = smartlist_new(); + char buf[256]; + char *b64 = NULL; + link_specifier_t *ls = NULL; (void) arg; @@ -385,9 +388,7 @@ test_link_specifier(void *arg) /* Test IPv4 for starter. */ { - char *b64, buf[256]; uint32_t ipv4; - link_specifier_t *ls; spec.type = LS_IPV4; ret = tor_addr_parse(&spec.u.ap.addr, "1.2.3.4"); @@ -414,9 +415,7 @@ test_link_specifier(void *arg) /* Test IPv6. */ { - char *b64, buf[256]; uint8_t ipv6[16]; - link_specifier_t *ls; spec.type = LS_IPV6; ret = tor_addr_parse(&spec.u.ap.addr, "[1:2:3:4::]"); @@ -445,9 +444,7 @@ test_link_specifier(void *arg) /* Test legacy. */ { - char *b64, buf[256]; uint8_t *id; - link_specifier_t *ls; spec.type = LS_LEGACY_ID; memset(spec.u.legacy_id, 'Y', sizeof(spec.u.legacy_id)); @@ -473,6 +470,8 @@ test_link_specifier(void *arg) } done: + link_specifier_free(ls); + tor_free(b64); smartlist_free(link_specifiers); }

1 0