April 2019 - tor-commits - lists.torproject.org

[tor/master] Clear memory in smartlist_remove_keeporder.
by dgoulet＠torproject.org 24 Apr '19

24 Apr '19

commit 670d0f9f5bb7d73ad236a035ed7bd69e96cadd41 Author: Tobias Stoeckmann <tobias(a)stoeckmann.org> Date: Sat Apr 13 16:55:36 2019 +0200 Clear memory in smartlist_remove_keeporder. The smartlist functions take great care to reset unused pointers inside the smartlist memory to NULL. The function smartlist_remove_keeporder does not clear memory in such way when elements have been removed. Therefore call memset after the for-loop that removes elements. If no element is removed, it is effectively a no-op. Signed-off-by: Tobias Stoeckmann <tobias(a)stoeckmann.org> --- changes/ticket30176 | 4 ++++ src/lib/smartlist_core/smartlist_core.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/changes/ticket30176 b/changes/ticket30176 new file mode 100644 index 000000000..da23760ce --- /dev/null +++ b/changes/ticket30176 @@ -0,0 +1,4 @@ + o Minor features (defense in depth): + - In smartlist_remove_keeporder(), set any pointers that become + unused to NULL, in case a bug causes them to be used later. Closes + ticket 30176. Patch from Tobias Stoeckmann. diff --git a/src/lib/smartlist_core/smartlist_core.c b/src/lib/smartlist_core/smartlist_core.c index 5947e7627..6b0a305a9 100644 --- a/src/lib/smartlist_core/smartlist_core.c +++ b/src/lib/smartlist_core/smartlist_core.c @@ -177,6 +177,8 @@ smartlist_remove_keeporder(smartlist_t *sl, const void *element) sl->list[i++] = sl->list[j]; } } + memset(sl->list + sl->num_used, 0, + sizeof(void *) * (num_used_orig - sl->num_used)); } /** If <b>sl</b> is nonempty, remove and return the final element. Otherwise,

1 0

[tor/master] Fix a memory leak in tor-resolve.c
by dgoulet＠torproject.org 24 Apr '19

24 Apr '19

commit cdafcc49bc273e472d40ea8c01219bbc165c92cb Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 11 19:09:23 2019 -0400 Fix a memory leak in tor-resolve.c Closes bug 30151/coverity CID 1441830. Bugfix on 0.4.0.1-alpha when we started doing trunnel parsing in tor-resolve.c. --- changes/bug30151 | 5 +++++ src/tools/tor-resolve.c | 1 + 2 files changed, 6 insertions(+) diff --git a/changes/bug30151 b/changes/bug30151 new file mode 100644 index 000000000..8ac9a320a --- /dev/null +++ b/changes/bug30151 @@ -0,0 +1,5 @@ + o Minor bugfixes (tor-resolve): + - Fix a memory leak in tor-resolve that could happen if Tor gave it a + malformed SOCKS response. (Memory leaks in tor-resolve don't actually + matter, but it's good to fix them anyway.) Fixes bug 30151; bugfix on + 0.4.0.1-alpha. diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c index 98b3a4a74..5d97696c1 100644 --- a/src/tools/tor-resolve.c +++ b/src/tools/tor-resolve.c @@ -424,6 +424,7 @@ do_resolve(const char *hostname, if (parsed < 2) { log_err(LD_NET, "Failed to parse SOCKS5 method selection " "message"); + socks5_server_method_free(m); goto err; }

1 0

[tor/master] Add an assertion to test_hs_cache.c to appease coverity.
by dgoulet＠torproject.org 24 Apr '19

24 Apr '19

commit 88dc7bc171ea8bb4696aac5b142d5b39b632dc79 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Apr 14 11:31:50 2019 -0400 Add an assertion to test_hs_cache.c to appease coverity. Coverity doesn't like to see a path where we test a pointer for NULL if we have already ready dereferenced the pointer on that path. While in this case, the check is not needed, it's best not to remove checks from the unit tests IMO. Instead, I'm adding an earlier check, so that coverity, when analyzing this function, will think that we have always checked the pointer before dereferencing it. Closes ticket 30180; CID 1444641. --- src/test/test_hs_cache.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/test_hs_cache.c b/src/test/test_hs_cache.c index 48e8d3b8c..2187c2be3 100644 --- a/src/test/test_hs_cache.c +++ b/src/test/test_hs_cache.c @@ -244,6 +244,7 @@ helper_fetch_desc_from_hsdir(const ed25519_public_key_t *blinded_key) /* Simulate an HTTP GET request to the HSDir */ conn = dir_connection_new(AF_INET); + tt_assert(conn); tor_addr_from_ipv4h(&conn->base_.addr, 0x7f000001); TO_CONN(conn)->linked = 1;/* Pretend the conn is encrypted :) */ retval = directory_handle_command_get(conn, hsdir_query_str,

1 0

[tor/master] Add test to verify that unused pointers are NULL.
by dgoulet＠torproject.org 24 Apr '19

24 Apr '19

commit 5a0c8579964aa1d27dd9be35afda5e7226c31fb4 Author: Tobias Stoeckmann <tobias(a)stoeckmann.org> Date: Sat Apr 13 16:54:05 2019 +0200 Add test to verify that unused pointers are NULL. The smartlist code takes great care to set all unused pointers inside the smartlist memory to NULL. Check if this is also the case after modifying the smartlist multiple times. Signed-off-by: Tobias Stoeckmann <tobias(a)stoeckmann.org> --- src/test/test_containers.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/test_containers.c b/src/test/test_containers.c index 7892a0885..ad272eeaf 100644 --- a/src/test/test_containers.c +++ b/src/test/test_containers.c @@ -1006,6 +1006,7 @@ test_container_smartlist_remove(void *arg) tt_ptr_op(smartlist_get(sl, 1), OP_EQ, &array[2]); tt_ptr_op(smartlist_get(sl, 2), OP_EQ, &array[1]); tt_ptr_op(smartlist_get(sl, 3), OP_EQ, &array[2]); + tt_ptr_op(sl->list[4], OP_EQ, NULL); done: smartlist_free(sl);

1 0

[tor/master] Fix pre-commit hook to correctly allow empty changes files.
by dgoulet＠torproject.org 24 Apr '19

24 Apr '19

commit 98e08b452f81316f108113d7ecff15a5e2855d63 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 10 11:49:23 2019 -0400 Fix pre-commit hook to correctly allow empty changes files. Fixes bug 30120; bugfix not in any released Tor. --- scripts/git/pre-commit.git-hook | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/git/pre-commit.git-hook b/scripts/git/pre-commit.git-hook index 65fa99f4c..4a962851b 100755 --- a/scripts/git/pre-commit.git-hook +++ b/scripts/git/pre-commit.git-hook @@ -12,7 +12,7 @@ cd "$workdir" || exit 1 set -e -if [ ! -z "ls ./changes/*" ]; then +if [ -n "$(ls ./changes/)" ]; then python scripts/maint/lintChanges.py ./changes/* fi @@ -26,7 +26,7 @@ if [ -d src/lib ]; then src/test/*.[ch] \ src/test/*/*.[ch] \ src/tools/*.[ch] -elif [ -d src/common]; then +elif [ -d src/common ]; then # This was the layout before 0.3.5 perl scripts/maint/checkSpace.pl -C \ src/common/*/*.[ch] \

1 0

[tor/master] Document check for 30176, since it's a bit subtle.
by dgoulet＠torproject.org 24 Apr '19

24 Apr '19

commit 82a3161c41e2c8d8d800a8c645a93b81bd8b2278 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 15 14:52:08 2019 -0400 Document check for 30176, since it's a bit subtle. --- src/test/test_containers.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/test/test_containers.c b/src/test/test_containers.c index ad272eeaf..67ba45797 100644 --- a/src/test/test_containers.c +++ b/src/test/test_containers.c @@ -1006,6 +1006,9 @@ test_container_smartlist_remove(void *arg) tt_ptr_op(smartlist_get(sl, 1), OP_EQ, &array[2]); tt_ptr_op(smartlist_get(sl, 2), OP_EQ, &array[1]); tt_ptr_op(smartlist_get(sl, 3), OP_EQ, &array[2]); + /* Ordinary code should never look at this pointer; we're doing it here + * to make sure that we really cleared the pointer we removed. + */ tt_ptr_op(sl->list[4], OP_EQ, NULL); done:

1 0

[tor/master] Do not warn about compatible OpenSSL upgrades
by dgoulet＠torproject.org 24 Apr '19

24 Apr '19

commit 8c4e68438dd680b6b36f9b337b12d098b08db9d8 Author: Bernhard M. Wiedemann <bwiedemann(a)suse.de> Date: Mon Apr 15 13:57:24 2019 +0200 Do not warn about compatible OpenSSL upgrades When releasing OpenSSL patch-level maintenance updates, we do not want to rebuild binaries using it. And since they guarantee ABI stability, we do not have to. Without this patch, warning messages were produced that confused users: https://bugzilla.opensuse.org/show_bug.cgi?id=1129411 Fixes bug 30190; bugfix on 0.2.4.2-alpha commit 7607ad2bec Signed-off-by: Bernhard M. Wiedemann <bwiedemann(a)suse.de> --- changes/bug30190 | 3 +++ src/lib/crypt_ops/crypto_openssl_mgt.c | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/changes/bug30190 b/changes/bug30190 new file mode 100644 index 000000000..e2352c3b9 --- /dev/null +++ b/changes/bug30190 @@ -0,0 +1,3 @@ + o Minor bugfixes (lib): + do not log a warning for OpenSSL versions that should be compatible + Fixes bug 30190; bugfix on 0.2.4.2-alpha diff --git a/src/lib/crypt_ops/crypto_openssl_mgt.c b/src/lib/crypt_ops/crypto_openssl_mgt.c index 60e4ea795..c97815f9a 100644 --- a/src/lib/crypt_ops/crypto_openssl_mgt.c +++ b/src/lib/crypt_ops/crypto_openssl_mgt.c @@ -213,6 +213,14 @@ crypto_openssl_early_init(void) !strcmp(version_str, OPENSSL_VERSION_TEXT)) { log_info(LD_CRYPTO, "OpenSSL version matches version from headers " "(%lx: %s).", version_num, version_str); + } else if ((version_num & 0xffff0000) == + (OPENSSL_VERSION_NUMBER & 0xffff0000)) { + log_notice(LD_CRYPTO, + "We compiled with OpenSSL %lx: %s and we " + "are running with OpenSSL %lx: %s. " + "These two versions should be binary compatible.", + (unsigned long)OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT, + version_num, version_str); } else { log_warn(LD_CRYPTO, "OpenSSL version from headers does not match the " "version we're running with. If you get weird crashes, that "

1 0

[tor/master] Merge branch 'tor-github/pr/939'
by dgoulet＠torproject.org 24 Apr '19

24 Apr '19

commit 4b599aaae4fc33460553306a8bba41d777558420 Merge: 4587e67df cdafcc49b Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Apr 24 09:43:28 2019 -0400 Merge branch 'tor-github/pr/939' changes/bug30151 | 5 +++++ src/tools/tor-resolve.c | 1 + 2 files changed, 6 insertions(+)

1 0

[tor/master] Merge branch 'tor-github/pr/930'
by dgoulet＠torproject.org 24 Apr '19

24 Apr '19

commit 4587e67dfd29f62ced4c52c18d2c2b7e1538080b Merge: 15d423838 98e08b452 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Apr 24 09:39:32 2019 -0400 Merge branch 'tor-github/pr/930' scripts/git/pre-commit.git-hook | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'tor-github/pr/955'
by dgoulet＠torproject.org 24 Apr '19

24 Apr '19

commit 5bcf87c224978970256af56a16d0ac676ac24a25 Merge: 4b599aaae 82a3161c4 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Apr 24 09:45:32 2019 -0400 Merge branch 'tor-github/pr/955' changes/ticket30176 | 4 ++++ src/lib/smartlist_core/smartlist_core.c | 2 ++ src/test/test_containers.c | 4 ++++ 3 files changed, 10 insertions(+)

1 0