February 2017 - tor-commits - lists.torproject.org

[tor/master] Use bash in src/test/test-network.sh
by nickm＠torproject.org 27 Feb '17

27 Feb '17

commit 73879aa5b686cf445389f02a3d954222ea6ae2ae Author: teor <teor2345(a)gmail.com> Date: Mon Feb 27 16:11:22 2017 +1100 Use bash in src/test/test-network.sh This ensures we reliably call chutney's newer tools/test-network.sh when available. Fixes bug 21562; bugfix on tor-0.2.9.1-alpha. --- changes/bug21562 | 4 ++++ src/test/test-network.sh | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changes/bug21562 b/changes/bug21562 new file mode 100644 index 0000000..48396a0 --- /dev/null +++ b/changes/bug21562 @@ -0,0 +1,4 @@ + o Minor bugfixes (testing): + - Use bash in src/test/test-network.sh. This ensures we reliably call + chutney's newer tools/test-network.sh when available. + Fixes bug 21562; bugfix on tor-0.2.9.1-alpha. diff --git a/src/test/test-network.sh b/src/test/test-network.sh index 2c37b6d..cb10f72 100755 --- a/src/test/test-network.sh +++ b/src/test/test-network.sh @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash # Please do not modify this script, it has been moved to chutney/tools @@ -178,7 +178,8 @@ export CHUTNEY_NETWORK=networks/$NETWORK_FLAVOUR # And finish up if we're doing a dry run if [ "$NETWORK_DRY_RUN" = true ]; then # we can't exit here, it breaks argument processing - return + # this only works in bash: return semantics are shell-specific + return 2>/dev/null || exit fi cd "$CHUTNEY_PATH"

1 0

[tor/maint-0.3.0] Log tor warnings during 'make test-network-all'
by nickm＠torproject.org 27 Feb '17

27 Feb '17

commit fb32c522320430f0fb419e1f05530850a5a90d2f Author: teor <teor2345(a)gmail.com> Date: Tue Feb 28 01:46:16 2017 +1100 Log tor warnings during 'make test-network-all' Requires the chutney changes from 21572. (Otherwise, asks users to upgrade their chutney.) Implements 21570. --- Makefile.am | 5 +++++ changes/feature21570 | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/Makefile.am b/Makefile.am index 631b44e..880420b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -54,6 +54,7 @@ TEST_CFLAGS= TEST_CPPFLAGS=-DTOR_UNIT_TESTS TEST_NETWORK_FLAGS=--hs-multi-client 1 endif +TEST_NETWORK_WARNING_FLAGS=--quiet --only-warnings if LIBFUZZER_ENABLED TEST_CFLAGS += -fsanitize-coverage=trace-pc-guard,trace-cmp,trace-div @@ -135,6 +136,10 @@ test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) src/tools/ done; \ for f in $$flavors; do \ $(SHELL) $(top_srcdir)/test-driver --test-name $$f --log-file $(TEST_NETWORK_ALL_LOG_DIR)/$$f.log --trs-file $(TEST_NETWORK_ALL_LOG_DIR)/$$f.trs $(TEST_NETWORK_ALL_DRIVER_FLAGS) $(top_srcdir)/src/test/test-network.sh --flavor $$f $(TEST_NETWORK_FLAGS); \ + $(top_srcdir)/src/test/test-network.sh $(TEST_NETWORK_WARNING_FLAGS); \ + if test $$? -eq 2 ; then \ + echo "Please update your chutney using 'git pull' to see tor warnings here."; \ + fi; \ done; \ echo "Log and result files are available in $(TEST_NETWORK_ALL_LOG_DIR)."; \ ! grep -q FAIL test_network_log/*.trs diff --git a/changes/feature21570 b/changes/feature21570 new file mode 100644 index 0000000..40555ee --- /dev/null +++ b/changes/feature21570 @@ -0,0 +1,5 @@ + o Minor features (testing): + - During 'make test-network-all', if tor logs any warnings, ask chutney + to output them. Requires a recent version of chutney with the 21572 + patch. + Implements 21570.

1 0

[tor/master] Add a quiet mode to test-network.sh
by nickm＠torproject.org 27 Feb '17

27 Feb '17

commit 39a4c5624bdb327166b2bf784c11c4cfab56895c Author: teor <teor2345(a)gmail.com> Date: Tue Feb 28 01:45:30 2017 +1100 Add a quiet mode to test-network.sh Requires the equivalent chutney changes in 21571. Part of 21570. --- src/test/test-network.sh | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/src/test/test-network.sh b/src/test/test-network.sh index 4d97768..692a6d5 100755 --- a/src/test/test-network.sh +++ b/src/test/test-network.sh @@ -2,7 +2,8 @@ # Please do not modify this script, it has been moved to chutney/tools -ECHO_N="/bin/echo -n" +export ECHO=${ECHO:-"echo"} +export ECHO_N=${ECHO_N:-"/bin/echo -n"} # Output is prefixed with the name of the script myname=$(basename $0) @@ -19,23 +20,22 @@ if [ "$TEST_NETWORK_RECURSING" != true ]; then # When we switch to using test-network.sh in chutney/tools, --dry-run # can be removed, because this script will find chutney, then pass all # arguments to chutney's test-network.sh - echo "$myname: Parsing command-line arguments to find \$CHUTNEY_PATH" export TEST_NETWORK_RECURSING=true . "$0" --dry-run "$@" # Call the chutney version of this script, if it exists, and we can find it if [ -d "$CHUTNEY_PATH" -a -x "$CHUTNEY_PATH/tools/test-network.sh" ]; then unset NETWORK_DRY_RUN - echo "$myname: Calling newer chutney script \ + $ECHO "$myname: Calling newer chutney script \ $CHUTNEY_PATH/tools/test-network.sh" "$CHUTNEY_PATH/tools/test-network.sh" "$@" exit $? else - echo "$myname: This script has moved to chutney/tools." - echo "$myname: Please update your chutney using 'git pull'." + $ECHO "$myname: This script has moved to chutney/tools." + $ECHO "$myname: Please update your chutney using 'git pull'." # When we switch to using test-network.sh in chutney/tools, we should # exit with a very loud failure here - echo "$myname: Falling back to the old tor version of the script." + $ECHO "$myname: Falling back to the old tor version of the script." fi fi @@ -89,10 +89,14 @@ do # process arguments, but don't call any other scripts export NETWORK_DRY_RUN=true ;; + --quiet) + export ECHO=true + export ECHO_N=true + ;; *) - echo "$myname: Sorry, I don't know what to do with '$1'." - echo "$myname: Maybe chutney's test-network.sh understands '$1'." - echo "$myname: Please update your chutney using 'git pull', and set \ + $ECHO "$myname: Sorry, I don't know what to do with '$1'." + $ECHO "$myname: Maybe chutney's test-network.sh understands '$1'." + $ECHO "$myname: Please update your chutney using 'git pull', and set \ \$CHUTNEY_PATH" # continue processing arguments during a dry run if [ "$NETWORK_DRY_RUN" != true ]; then @@ -113,15 +117,15 @@ if [ ! -d "$TOR_DIR" ]; then if [ -d "$BUILDDIR/src/or" -a -d "$BUILDDIR/src/tools" ]; then # Choose the build directory # But only if it looks like one - echo "$myname: \$TOR_DIR not set, trying \$BUILDDIR" + $ECHO "$myname: \$TOR_DIR not set, trying \$BUILDDIR" export TOR_DIR="$BUILDDIR" elif [ -d "$PWD/src/or" -a -d "$PWD/src/tools" ]; then # Guess the tor directory is the current directory # But only if it looks like one - echo "$myname: \$TOR_DIR not set, trying \$PWD" + $ECHO "$myname: \$TOR_DIR not set, trying \$PWD" export TOR_DIR="$PWD" else - echo "$myname: no \$TOR_DIR, chutney will use \$PATH for tor binaries" + $ECHO "$myname: no \$TOR_DIR, chutney will use \$PATH for tor binaries" unset TOR_DIR fi fi @@ -133,19 +137,19 @@ fi # - fail and tell the user how to clone the chutney repository if [ ! -d "$CHUTNEY_PATH" -o ! -x "$CHUTNEY_PATH/chutney" ]; then if [ -x "$PWD/chutney" ]; then - echo "$myname: \$CHUTNEY_PATH not valid, trying \$PWD" + $ECHO "$myname: \$CHUTNEY_PATH not valid, trying \$PWD" export CHUTNEY_PATH="$PWD" elif [ -d "$TOR_DIR" -a -d "$TOR_DIR/../chutney" -a \ -x "$TOR_DIR/../chutney/chutney" ]; then - echo "$myname: \$CHUTNEY_PATH not valid, trying \$TOR_DIR/../chutney" + $ECHO "$myname: \$CHUTNEY_PATH not valid, trying \$TOR_DIR/../chutney" export CHUTNEY_PATH="$TOR_DIR/../chutney" else # TODO: work out how to package and install chutney, # so users can find it in $PATH - echo "$myname: missing 'chutney' in \$CHUTNEY_PATH ($CHUTNEY_PATH)" - echo "$myname: Get chutney: git clone https://git.torproject.org/\ + $ECHO "$myname: missing 'chutney' in \$CHUTNEY_PATH ($CHUTNEY_PATH)" + $ECHO "$myname: Get chutney: git clone https://git.torproject.org/\ chutney.git" - echo "$myname: Set \$CHUTNEY_PATH to a non-standard location: export \ + $ECHO "$myname: Set \$CHUTNEY_PATH to a non-standard location: export \ CHUTNEY_PATH=\`pwd\`/chutney" unset CHUTNEY_PATH exit 1 @@ -186,7 +190,7 @@ BOOTSTRAP_TIME=${BOOTSTRAP_TIME:-35} $ECHO_N "$myname: sleeping for $BOOTSTRAP_TIME seconds" n=$BOOTSTRAP_TIME; while [ $n -gt 0 ]; do sleep 1; n=$(expr $n - 1); $ECHO_N . -done; echo "" +done; $ECHO "" ./chutney verify $CHUTNEY_NETWORK VERIFY_EXIT_STATUS=$? # work around a bug/feature in make -j2 (or more)

1 0

[tor/maint-0.3.0] Merge remote-tracking branch 'teor/feature21570-030' into maint-0.3.0
by nickm＠torproject.org 27 Feb '17

27 Feb '17

commit eef8bd4d3c49bf093f11bf6fa81bfd8561f02fc5 Merge: c51919b 73879aa Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 27 11:36:39 2017 -0500 Merge remote-tracking branch 'teor/feature21570-030' into maint-0.3.0 Makefile.am | 5 +++++ changes/bug21562 | 4 ++++ changes/feature21570 | 5 +++++ src/test/test-network.sh | 47 ++++++++++++++++++++++++++--------------------- 4 files changed, 40 insertions(+), 21 deletions(-)

1 0

[tor/maint-0.3.0] Try to check for (and prevent) buffer size INT_MAX overflow better.
by nickm＠torproject.org 27 Feb '17

27 Feb '17

commit ee5471f9aab55269c8c480f1f90dfeb08803ac15 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 13 15:51:55 2017 -0500 Try to check for (and prevent) buffer size INT_MAX overflow better. Possible fix or diagnostic for 21369. --- changes/bug21369_check | 3 +++ src/or/buffers.c | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/changes/bug21369_check b/changes/bug21369_check new file mode 100644 index 0000000..2cd808c --- /dev/null +++ b/changes/bug21369_check @@ -0,0 +1,3 @@ + o Minor features (reliability, crash): + - Try better to detect problems in buffers where they might grow (or + think they have grown) over 2 GB in size. Diagnostic for bug 21369. diff --git a/src/or/buffers.c b/src/or/buffers.c index 8981fd2..fc9e7e4 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -562,6 +562,11 @@ read_to_buf(tor_socket_t s, size_t at_most, buf_t *buf, int *reached_eof, tor_assert(reached_eof); tor_assert(SOCKET_OK(s)); + if (BUG(buf->datalen >= INT_MAX)) + return -1; + if (BUG(buf->datalen >= INT_MAX - at_most)) + return -1; + while (at_most > total_read) { size_t readlen = at_most - total_read; chunk_t *chunk; @@ -619,6 +624,11 @@ read_to_buf_tls(tor_tls_t *tls, size_t at_most, buf_t *buf) check(); + if (BUG(buf->datalen >= INT_MAX)) + return -1; + if (BUG(buf->datalen >= INT_MAX - at_most)) + return -1; + while (at_most > total_read) { size_t readlen = at_most - total_read; chunk_t *chunk; @@ -813,6 +823,11 @@ write_to_buf(const char *string, size_t string_len, buf_t *buf) return (int)buf->datalen; check(); + if (BUG(buf->datalen >= INT_MAX)) + return -1; + if (BUG(buf->datalen >= INT_MAX - string_len)) + return -1; + while (string_len) { size_t copy; if (!buf->tail || !CHUNK_REMAINING_CAPACITY(buf->tail)) @@ -962,6 +977,12 @@ move_buf_to_buf(buf_t *buf_out, buf_t *buf_in, size_t *buf_flushlen) /* We can do way better here, but this doesn't turn up in any profiles. */ char b[4096]; size_t cp, len; + + if (BUG(buf_out->datalen >= INT_MAX)) + return -1; + if (BUG(buf_out->datalen >= INT_MAX - *buf_flushlen)) + return -1; + len = *buf_flushlen; if (len > buf_in->datalen) len = buf_in->datalen;

1 0

[tor/maint-0.3.0] Merge branch 'bug21369_check_029_squashed' into maint-0.3.0
by nickm＠torproject.org 27 Feb '17

27 Feb '17

commit c51919b0da2afe73780508e5593ebf9052e177cc Merge: 6747c62 074f248 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 27 11:25:34 2017 -0500 Merge branch 'bug21369_check_029_squashed' into maint-0.3.0 changes/bug21369_check | 3 +++ src/or/buffers.c | 21 +++++++++++++++++++++ src/or/dirserv.c | 10 ++++++++-- 3 files changed, 32 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.3.0] Add one other BUG check to try to fix/solve 21369.
by nickm＠torproject.org 27 Feb '17

27 Feb '17

commit 074f24846321b8d08a8f67c37d72018842274c4e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 27 09:12:51 2017 -0500 Add one other BUG check to try to fix/solve 21369. Teor thinks that this connection_dirserv_add_dir_bytes_to_outbuf() might be the problem, if the "remaining" calculation underflows. So I'm adding a couple of checks there, and improving the casts. --- src/or/dirserv.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index fa3938b..fd9d0c7 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -3629,8 +3629,14 @@ connection_dirserv_add_dir_bytes_to_outbuf(dir_connection_t *conn) if (bytes < 8192) bytes = 8192; remaining = conn->cached_dir->dir_z_len - conn->cached_dir_offset; - if (bytes > remaining) + if (BUG(remaining < 0)) { + remaining = 0; + } + if (bytes > remaining) { bytes = (ssize_t) remaining; + if (BUG(bytes < 0)) + return -1; + } if (conn->zlib_state) { connection_write_to_buf_zlib( @@ -3641,7 +3647,7 @@ connection_dirserv_add_dir_bytes_to_outbuf(dir_connection_t *conn) bytes, TO_CONN(conn)); } conn->cached_dir_offset += bytes; - if (conn->cached_dir_offset == (int)conn->cached_dir->dir_z_len) { + if (conn->cached_dir_offset >= (off_t)conn->cached_dir->dir_z_len) { /* We just wrote the last one; finish up. */ connection_dirserv_finish_spooling(conn); cached_dir_decref(conn->cached_dir);

1 0

[tor/release-0.3.0] Try to check for (and prevent) buffer size INT_MAX overflow better.
by nickm＠torproject.org 27 Feb '17

27 Feb '17

commit ee5471f9aab55269c8c480f1f90dfeb08803ac15 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 13 15:51:55 2017 -0500 Try to check for (and prevent) buffer size INT_MAX overflow better. Possible fix or diagnostic for 21369. --- changes/bug21369_check | 3 +++ src/or/buffers.c | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/changes/bug21369_check b/changes/bug21369_check new file mode 100644 index 0000000..2cd808c --- /dev/null +++ b/changes/bug21369_check @@ -0,0 +1,3 @@ + o Minor features (reliability, crash): + - Try better to detect problems in buffers where they might grow (or + think they have grown) over 2 GB in size. Diagnostic for bug 21369. diff --git a/src/or/buffers.c b/src/or/buffers.c index 8981fd2..fc9e7e4 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -562,6 +562,11 @@ read_to_buf(tor_socket_t s, size_t at_most, buf_t *buf, int *reached_eof, tor_assert(reached_eof); tor_assert(SOCKET_OK(s)); + if (BUG(buf->datalen >= INT_MAX)) + return -1; + if (BUG(buf->datalen >= INT_MAX - at_most)) + return -1; + while (at_most > total_read) { size_t readlen = at_most - total_read; chunk_t *chunk; @@ -619,6 +624,11 @@ read_to_buf_tls(tor_tls_t *tls, size_t at_most, buf_t *buf) check(); + if (BUG(buf->datalen >= INT_MAX)) + return -1; + if (BUG(buf->datalen >= INT_MAX - at_most)) + return -1; + while (at_most > total_read) { size_t readlen = at_most - total_read; chunk_t *chunk; @@ -813,6 +823,11 @@ write_to_buf(const char *string, size_t string_len, buf_t *buf) return (int)buf->datalen; check(); + if (BUG(buf->datalen >= INT_MAX)) + return -1; + if (BUG(buf->datalen >= INT_MAX - string_len)) + return -1; + while (string_len) { size_t copy; if (!buf->tail || !CHUNK_REMAINING_CAPACITY(buf->tail)) @@ -962,6 +977,12 @@ move_buf_to_buf(buf_t *buf_out, buf_t *buf_in, size_t *buf_flushlen) /* We can do way better here, but this doesn't turn up in any profiles. */ char b[4096]; size_t cp, len; + + if (BUG(buf_out->datalen >= INT_MAX)) + return -1; + if (BUG(buf_out->datalen >= INT_MAX - *buf_flushlen)) + return -1; + len = *buf_flushlen; if (len > buf_in->datalen) len = buf_in->datalen;

1 0

[tor/release-0.3.0] Add one other BUG check to try to fix/solve 21369.
by nickm＠torproject.org 27 Feb '17

27 Feb '17

commit 074f24846321b8d08a8f67c37d72018842274c4e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 27 09:12:51 2017 -0500 Add one other BUG check to try to fix/solve 21369. Teor thinks that this connection_dirserv_add_dir_bytes_to_outbuf() might be the problem, if the "remaining" calculation underflows. So I'm adding a couple of checks there, and improving the casts. --- src/or/dirserv.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index fa3938b..fd9d0c7 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -3629,8 +3629,14 @@ connection_dirserv_add_dir_bytes_to_outbuf(dir_connection_t *conn) if (bytes < 8192) bytes = 8192; remaining = conn->cached_dir->dir_z_len - conn->cached_dir_offset; - if (bytes > remaining) + if (BUG(remaining < 0)) { + remaining = 0; + } + if (bytes > remaining) { bytes = (ssize_t) remaining; + if (BUG(bytes < 0)) + return -1; + } if (conn->zlib_state) { connection_write_to_buf_zlib( @@ -3641,7 +3647,7 @@ connection_dirserv_add_dir_bytes_to_outbuf(dir_connection_t *conn) bytes, TO_CONN(conn)); } conn->cached_dir_offset += bytes; - if (conn->cached_dir_offset == (int)conn->cached_dir->dir_z_len) { + if (conn->cached_dir_offset >= (off_t)conn->cached_dir->dir_z_len) { /* We just wrote the last one; finish up. */ connection_dirserv_finish_spooling(conn); cached_dir_decref(conn->cached_dir);

1 0

[tor/release-0.3.0] Merge branch 'bug21369_check_029_squashed' into maint-0.3.0
by nickm＠torproject.org 27 Feb '17

27 Feb '17

commit c51919b0da2afe73780508e5593ebf9052e177cc Merge: 6747c62 074f248 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 27 11:25:34 2017 -0500 Merge branch 'bug21369_check_029_squashed' into maint-0.3.0 changes/bug21369_check | 3 +++ src/or/buffers.c | 21 +++++++++++++++++++++ src/or/dirserv.c | 10 ++++++++-- 3 files changed, 32 insertions(+), 2 deletions(-)

1 0