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

[tor/master] Lower log level of unlink() errors in networkstatus_set_current_consensus().
by asn＠torproject.org 30 Apr '19

30 Apr '19

commit 04290724957e14710646a5c28bd3230710466c92 Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Apr 25 01:50:13 2019 +0200 Lower log level of unlink() errors in networkstatus_set_current_consensus(). In this patch we lower the log level of the failures for the three calls to unlink() in networkstatus_set_current_consensus(). These errors might trigger on Windows because the memory mapped consensus file keeps the file in open state even after we have close()'d it. Windows will then error on the unlink() call with a "Permission denied" error. The consequences of ignoring these errors is that we leave an unused file around on the file-system, which is an easier way to fix this problem right now than refactoring networkstatus_set_current_consensus(). See: https://bugs.torproject.org/29930 --- changes/bug29930 | 4 ++++ src/feature/nodelist/networkstatus.c | 18 +++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/changes/bug29930 b/changes/bug29930 new file mode 100644 index 000000000..a99b11430 --- /dev/null +++ b/changes/bug29930 @@ -0,0 +1,4 @@ + o Minor bugfixes (UI): + - Lower log level of unlink() errors during bootstrap. Fixes bug 29930; + bugfix on 0.4.0.1-alpha. + diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c index a988f700f..24e3b212f 100644 --- a/src/feature/nodelist/networkstatus.c +++ b/src/feature/nodelist/networkstatus.c @@ -2033,9 +2033,9 @@ networkstatus_set_current_consensus(const char *consensus, * latest consensus. */ if (was_waiting_for_certs && from_cache) if (unlink(unverified_fname) != 0) { - log_warn(LD_FS, - "Failed to unlink %s: %s", - unverified_fname, strerror(errno)); + log_debug(LD_FS, + "Failed to unlink %s: %s", + unverified_fname, strerror(errno)); } } goto done; @@ -2048,9 +2048,9 @@ networkstatus_set_current_consensus(const char *consensus, } if (was_waiting_for_certs && (r < -1) && from_cache) { if (unlink(unverified_fname) != 0) { - log_warn(LD_FS, - "Failed to unlink %s: %s", - unverified_fname, strerror(errno)); + log_debug(LD_FS, + "Failed to unlink %s: %s", + unverified_fname, strerror(errno)); } } goto done; @@ -2115,9 +2115,9 @@ networkstatus_set_current_consensus(const char *consensus, waiting->set_at = 0; waiting->dl_failed = 0; if (unlink(unverified_fname) != 0) { - log_warn(LD_FS, - "Failed to unlink %s: %s", - unverified_fname, strerror(errno)); + log_debug(LD_FS, + "Failed to unlink %s: %s", + unverified_fname, strerror(errno)); } }

1 0

[tor/maint-0.4.0] Merge branch 'tor-github/pr/978' into maint-0.4.0
by asn＠torproject.org 30 Apr '19

30 Apr '19

commit e1d4e2badbd6cdb8c3939c6a1e6ebdcfeca68b49 Merge: 593d29920 042907249 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Apr 30 19:26:14 2019 +0300 Merge branch 'tor-github/pr/978' into maint-0.4.0 changes/bug29930 | 4 ++++ src/feature/nodelist/networkstatus.c | 18 +++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-)

1 0

[tor/master] Merge branch 'tor-github/pr/985'
by asn＠torproject.org 30 Apr '19

30 Apr '19

commit f2800b53ad08abb867a3e31590f03f92f9f17807 Merge: d885ed867 6d347fe32 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Apr 30 19:25:32 2019 +0300 Merge branch 'tor-github/pr/985' changes/ticket30076 | 2 + configure.ac | 1 - contrib/README | 2 - contrib/dist/suse/tor.sh.in | 118 -------------------------------------------- contrib/include.am | 1 - 5 files changed, 2 insertions(+), 122 deletions(-)

1 0

[tor/master] Remove obsolete OpenSUSE initscript
by asn＠torproject.org 30 Apr '19

30 Apr '19

commit 6d347fe329cdb2fdda4059ce36a6916225ab4c87 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Apr 9 11:23:03 2019 +0300 Remove obsolete OpenSUSE initscript --- changes/ticket30076 | 2 + configure.ac | 1 - contrib/README | 2 - contrib/dist/suse/tor.sh.in | 118 -------------------------------------------- contrib/include.am | 1 - 5 files changed, 2 insertions(+), 122 deletions(-) diff --git a/changes/ticket30076 b/changes/ticket30076 new file mode 100644 index 000000000..1334bc460 --- /dev/null +++ b/changes/ticket30076 @@ -0,0 +1,2 @@ + o Removed features: + - Remove obsolete OpenSUSE initscript. Resolves issue 30076. diff --git a/configure.ac b/configure.ac index 3ea578bbb..e65e960d7 100644 --- a/configure.ac +++ b/configure.ac @@ -2457,7 +2457,6 @@ AC_CONFIG_FILES([ Doxyfile Makefile config.rust - contrib/dist/suse/tor.sh contrib/operator-tools/tor.logrotate contrib/dist/torctl contrib/dist/tor.service diff --git a/contrib/README b/contrib/README index 3a94bb501..735fcf4c9 100644 --- a/contrib/README +++ b/contrib/README @@ -34,8 +34,6 @@ tools. Everybody likes to write init scripts differently, it seems. tor.service is a sample service file for use with systemd. -The suse/ subdirectory contains files used by the suse distribution. - operator-tools/ -- Tools for Tor relay operators ------------------------------------------------ diff --git a/contrib/dist/suse/tor.sh.in b/contrib/dist/suse/tor.sh.in deleted file mode 100644 index b7e9005eb..000000000 --- a/contrib/dist/suse/tor.sh.in +++ /dev/null @@ -1,118 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2006-2007 Andrew Lewman -# -# tor The Onion Router -# -# Startup/shutdown script for tor. This is a wrapper around torctl; -# torctl does the actual work in a relatively system-independent, or at least -# distribution-independent, way, and this script deals with fitting the -# whole thing into the conventions of the particular system at hand. -# -# These next couple of lines "declare" tor for the "chkconfig" program, -# originally from SGI, used on Red Hat/Fedora and probably elsewhere. -# -# chkconfig: 2345 90 10 -# description: Onion Router - A low-latency anonymous proxy -# - -### BEGIN INIT INFO -# Provides: tor -# Required-Start: $remote_fs $network -# Required-Stop: $remote_fs $network -# Default-Start: 3 5 -# Default-Stop: 0 1 2 6 -# Short-Description: Start the tor daemon -# Description: Start the tor daemon: the anon-proxy server -### END INIT INFO - -. /etc/rc.status - -# Shell functions sourced from /etc/rc.status: -# rc_check check and set local and overall rc status -# rc_status check and set local and overall rc status -# rc_status -v ditto but be verbose in local rc status -# rc_status -v -r ditto and clear the local rc status -# rc_failed set local and overall rc status to failed -# rc_reset clear local rc status (overall remains) -# rc_exit exit appropriate to overall rc status - -# First reset status of this service -rc_reset - -# Increase open file descriptors a reasonable amount -ulimit -n 8192 - -TORCTL=@BINDIR@/torctl - -# torctl will use these environment variables -TORUSER=@TORUSER@ -export TORUSER -TORGROUP=@TORGROUP@ -export TORGROUP - -TOR_DAEMON_PID_DIR="@LOCALSTATEDIR@/run/tor" - -if [ -x /bin/su ] ; then - SUPROG=/bin/su -elif [ -x /sbin/su ] ; then - SUPROG=/sbin/su -elif [ -x /usr/bin/su ] ; then - SUPROG=/usr/bin/su -elif [ -x /usr/sbin/su ] ; then - SUPROG=/usr/sbin/su -else - SUPROG=/bin/su -fi - -case "$1" in - - start) - echo "Starting tor daemon" - - if [ ! -d $TOR_DAEMON_PID_DIR ] ; then - mkdir -p $TOR_DAEMON_PID_DIR - chown $TORUSER:$TORGROUP $TOR_DAEMON_PID_DIR - fi - - ## Start daemon with startproc(8). If this fails - ## the echo return value is set appropriate. - - startproc -f $TORCTL start - # Remember status and be verbose - rc_status -v - ;; - - stop) - echo "Stopping tor daemon" - startproc -f $TORCTL stop - # Remember status and be verbose - rc_status -v - ;; - - restart) - echo "Restarting tor daemon" - startproc -f $TORCTL restart - # Remember status and be verbose - rc_status -v - ;; - - reload) - echo "Reloading tor daemon" - startproc -f $TORCTL reload - # Remember status and be verbose - rc_status -v - ;; - - status) - startproc -f $TORCTL status - # Remember status and be verbose - rc_status -v - ;; - - *) - echo "Usage: $0 (start|stop|restart|reload|status)" - RETVAL=1 -esac - -rc_exit diff --git a/contrib/include.am b/contrib/include.am index 9f4775632..8dd859330 100644 --- a/contrib/include.am +++ b/contrib/include.am @@ -3,7 +3,6 @@ EXTRA_DIST+= \ contrib/README \ contrib/client-tools/torify \ contrib/dist/rc.subr \ - contrib/dist/suse/tor.sh.in \ contrib/dist/torctl \ contrib/dist/tor.service.in \ contrib/operator-tools/tor-exit-notice.html \

1 0

[tor/master] Merge branch 'tor-github/pr/978' into maint-0.4.0
by asn＠torproject.org 30 Apr '19

30 Apr '19

commit e1d4e2badbd6cdb8c3939c6a1e6ebdcfeca68b49 Merge: 593d29920 042907249 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Apr 30 19:26:14 2019 +0300 Merge branch 'tor-github/pr/978' into maint-0.4.0 changes/bug29930 | 4 ++++ src/feature/nodelist/networkstatus.c | 18 +++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.0'
by asn＠torproject.org 30 Apr '19

30 Apr '19

commit 847fc3280d4a77859c28f4c6c91c2cdf863c5c43 Merge: f2800b53a e1d4e2bad Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Apr 30 19:26:30 2019 +0300 Merge branch 'maint-0.4.0' changes/bug29930 | 4 ++++ src/feature/nodelist/networkstatus.c | 18 +++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-)

1 0

[tor/master] On failure to create extend info for an introduction point, don't leak.
by asn＠torproject.org 30 Apr '19

30 Apr '19

commit 7c98105d5617a0423c2d45941e7c0906de649128 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 11 17:35:19 2019 -0400 On failure to create extend info for an introduction point, don't leak. This is CID 1438152. No backport needed: this path is already inside a BUG() guard. --- src/feature/rend/rendservice.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/feature/rend/rendservice.c b/src/feature/rend/rendservice.c index 57475a64b..996e7b9a2 100644 --- a/src/feature/rend/rendservice.c +++ b/src/feature/rend/rendservice.c @@ -4227,6 +4227,7 @@ rend_consider_services_intro_points(time_t now) * directly ourselves. */ intro->extend_info = extend_info_from_node(node, 0); if (BUG(intro->extend_info == NULL)) { + tor_free(intro); break; } intro->intro_key = crypto_pk_new();

1 0

[tor/master] changes file and practracker updates for 30147.
by asn＠torproject.org 30 Apr '19

30 Apr '19

commit e39b53ef7de4ac6705869fd153da7b0f87c48ee6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 11 17:59:21 2019 -0400 changes file and practracker updates for 30147. --- changes/coverity_falsepos | 4 ++++ scripts/maint/practracker/exceptions.txt | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/changes/coverity_falsepos b/changes/coverity_falsepos new file mode 100644 index 000000000..9fbb01a0c --- /dev/null +++ b/changes/coverity_falsepos @@ -0,0 +1,4 @@ + o Code simplification and refactoring: + - Refactor several places in our code that coverity incorrectly believed + that we might have memory leaks, so that we can analyze our software + more easily. Closes ticket 30147. diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index 7d03bf27d..b84396272 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -119,7 +119,7 @@ problem function-size /src/core/or/connection_or.c:connection_or_client_learned_ problem function-size /src/core/or/connection_or.c:connection_or_compute_authenticate_cell_body() 235 problem file-size /src/core/or/policies.c 3163 problem function-size /src/core/or/policies.c:policy_summarize() 107 -problem function-size /src/core/or/protover.c:protover_all_supported() 116 +problem function-size /src/core/or/protover.c:protover_all_supported() 117 problem file-size /src/core/or/relay.c 3173 problem function-size /src/core/or/relay.c:circuit_receive_relay_cell() 123 problem function-size /src/core/or/relay.c:relay_send_command_from_edge_() 101 @@ -245,7 +245,7 @@ problem function-size /src/feature/rend/rendmid.c:rend_mid_establish_intro_legac problem function-size /src/feature/rend/rendparse.c:rend_parse_v2_service_descriptor() 187 problem function-size /src/feature/rend/rendparse.c:rend_decrypt_introduction_points() 104 problem function-size /src/feature/rend/rendparse.c:rend_parse_introduction_points() 131 -problem file-size /src/feature/rend/rendservice.c 4509 +problem file-size /src/feature/rend/rendservice.c 4510 problem function-size /src/feature/rend/rendservice.c:rend_service_prune_list_impl_() 107 problem function-size /src/feature/rend/rendservice.c:rend_config_service() 164 problem function-size /src/feature/rend/rendservice.c:rend_service_load_auth_keys() 178 @@ -256,7 +256,7 @@ problem function-size /src/feature/rend/rendservice.c:rend_service_intro_has_ope problem function-size /src/feature/rend/rendservice.c:rend_service_rendezvous_has_opened() 117 problem function-size /src/feature/rend/rendservice.c:directory_post_to_hs_dir() 108 problem function-size /src/feature/rend/rendservice.c:upload_service_descriptor() 111 -problem function-size /src/feature/rend/rendservice.c:rend_consider_services_intro_points() 169 +problem function-size /src/feature/rend/rendservice.c:rend_consider_services_intro_points() 170 problem function-size /src/feature/stats/rephist.c:rep_hist_load_mtbf_data() 185 problem function-size /src/feature/stats/rephist.c:rep_hist_format_exit_stats() 148 problem function-size /src/lib/compress/compress.c:tor_compress_impl() 133

1 0

[tor/master] Fix a memory leak on failure to create keys directory.
by asn＠torproject.org 30 Apr '19

30 Apr '19

commit 85ff6f9114eb2d492d88ed55d01a69f7bafb10be Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 11 18:18:14 2019 -0400 Fix a memory leak on failure to create keys directory. Fixes bug 30148, which is also CID 1437429 and CID 1437454. Bugfix on 0.3.3.1-alpha, when separate key directories became a thing. --- changes/bug30148 | 4 ++++ src/or/routerkeys.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/bug30148 b/changes/bug30148 new file mode 100644 index 000000000..7d0257e3f --- /dev/null +++ b/changes/bug30148 @@ -0,0 +1,4 @@ + o Minor bugfixes (memory leak): + - Avoid a minor memory leak that could occur on relays when + creating a keys directory failed. Fixes bug 30148; bugfix on + 0.3.3.1-alpha. diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c index 43460da8c..dd19d28d0 100644 --- a/src/or/routerkeys.c +++ b/src/or/routerkeys.c @@ -816,7 +816,7 @@ load_ed_keys(const or_options_t *options, time_t now) /* Check/Create the key directory */ if (create_keys_directory(options) < 0) - return -1; + goto err; char *fname; if (options->master_key_fname) { @@ -1403,4 +1403,3 @@ routerkeys_free_all(void) rsa_ed_crosscert = NULL; // redundant rsa_ed_crosscert_len = 0; } -

1 0

[tor/master] Don't leak on logic error in string_is_valid_nonrfc_hostname()
by asn＠torproject.org 30 Apr '19

30 Apr '19

commit 4e3d144fb0940d8ee5a89427d471ea3656e8e122 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 11 17:40:05 2019 -0400 Don't leak on logic error in string_is_valid_nonrfc_hostname() This is CID 1437438. No backport needed: this is unreachable, and guarded with a BUG() check. --- src/lib/net/address.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/lib/net/address.c b/src/lib/net/address.c index 214d8aa3e..7dec4c8e2 100644 --- a/src/lib/net/address.c +++ b/src/lib/net/address.c @@ -2027,8 +2027,12 @@ string_is_valid_nonrfc_hostname(const char *string) smartlist_split_string(components,string,".",0,0); - if (BUG(smartlist_len(components) == 0)) - return 0; // LCOV_EXCL_LINE should be impossible given the earlier checks. + if (BUG(smartlist_len(components) == 0)) { + // LCOV_EXCL_START should be impossible given the earlier checks. + smartlist_free(components); + return 0; + // LCOV_EXCL_STOP + } /* Allow a single terminating '.' used rarely to indicate domains * are FQDNs rather than relative. */

1 0