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

[tor/master] Fix a leak-on-error case in 0.2.4 spotted by coverity
by nickm＠torproject.org 07 Feb '13

07 Feb '13

commit ee1d8dc4805e0aabfbda4c8b34e12d2071333a51 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 28 22:57:00 2012 -0500 Fix a leak-on-error case in 0.2.4 spotted by coverity This one hits if the snprintf() fails when we're writing our IPv6 exit policy. It's new in 0.2.4.7-alpha. Part of bug 7816. --- changes/bug7816.024 | 4 ++++ src/or/router.c | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/changes/bug7816.024 b/changes/bug7816.024 new file mode 100644 index 0000000..6ed6b74 --- /dev/null +++ b/changes/bug7816.024 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Avoid leaking IPv6 policy content if we fail to format it into + a router descriptor. Spotted by Coverity. Fixes part of 7816; + bugfix on 0.2.4.7-alpha. diff --git a/src/or/router.c b/src/or/router.c index c7380cb..e892ce0 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2190,6 +2190,7 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router, "ipv6-policy %s\n", p6); if (result<0) { log_warn(LD_BUG,"Descriptor printf of policy ran out of room"); + tor_free(p6); return -1; } written += result;

1 0

[tor/master] Merge remote-tracking branch 'public/bug7816_024'
by nickm＠torproject.org 07 Feb '13

07 Feb '13

commit 0061d428900946ce8bf5c8bfb4c2b3b5faa4f691 Merge: ad28397 f272ee6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 7 15:13:21 2013 -0500 Merge remote-tracking branch 'public/bug7816_024' changes/bug7816.024 | 8 ++++++++ src/or/dirvote.c | 20 +++++++++++--------- src/or/router.c | 1 + 3 files changed, 20 insertions(+), 9 deletions(-)

1 0

[tor/master] Fix an impossible-in-normal-operation leaks in dirvote
by nickm＠torproject.org 07 Feb '13

07 Feb '13

commit f272ee6a20ec0df491bed485a0eea4ae2f82e40c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 28 23:04:44 2012 -0500 Fix an impossible-in-normal-operation leaks in dirvote Spotted by coverity; partial fix for 7816; bugfix on 0.2.0.5-alpha. --- changes/bug7816.024 | 4 ++++ src/or/dirvote.c | 20 +++++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/changes/bug7816.024 b/changes/bug7816.024 index 6ed6b74..b5d55f5 100644 --- a/changes/bug7816.024 +++ b/changes/bug7816.024 @@ -2,3 +2,7 @@ - Avoid leaking IPv6 policy content if we fail to format it into a router descriptor. Spotted by Coverity. Fixes part of 7816; bugfix on 0.2.4.7-alpha. + + - Avoid leaking memory if we fail to compute a consensus signature + or we generated a consensus we couldn't parse. Spotted by Coverity. + Fixes part of 7816; bugfix on 0.2.0.5-alpha. diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 1b9af0f..72ae097 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -2139,7 +2139,7 @@ networkstatus_compute_consensus(smartlist_t *votes, digest, digest_len, legacy_signing_key)) { log_warn(LD_BUG, "Couldn't sign consensus networkstatus."); - return NULL; /* This leaks, but it should never happen. */ + goto done; } smartlist_add(chunks, tor_strdup(sigbuf)); } @@ -2147,13 +2147,6 @@ networkstatus_compute_consensus(smartlist_t *votes, result = smartlist_join_strings(chunks, "", 0, NULL); - tor_free(client_versions); - tor_free(server_versions); - SMARTLIST_FOREACH(flags, char *, cp, tor_free(cp)); - smartlist_free(flags); - SMARTLIST_FOREACH(chunks, char *, cp, tor_free(cp)); - smartlist_free(chunks); - { networkstatus_t *c; if (!(c = networkstatus_parse_vote_from_string(result, NULL, @@ -2161,7 +2154,7 @@ networkstatus_compute_consensus(smartlist_t *votes, log_err(LD_BUG, "Generated a networkstatus consensus we couldn't " "parse."); tor_free(result); - return NULL; + goto done; } // Verify balancing parameters if (consensus_method >= MIN_METHOD_FOR_BW_WEIGHTS && added_weights) { @@ -2170,6 +2163,15 @@ networkstatus_compute_consensus(smartlist_t *votes, networkstatus_vote_free(c); } + done: + + tor_free(client_versions); + tor_free(server_versions); + SMARTLIST_FOREACH(flags, char *, cp, tor_free(cp)); + smartlist_free(flags); + SMARTLIST_FOREACH(chunks, char *, cp, tor_free(cp)); + smartlist_free(chunks); + return result; }

1 0

[tor/master] When we get an END cell before CONNECTED, don't report SOCKS success
by nickm＠torproject.org 07 Feb '13

07 Feb '13

commit d1b5ae903f330c03c32baa60fcc6679d148ad8ac Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 16 12:08:10 2013 -0500 When we get an END cell before CONNECTED, don't report SOCKS success Bug 7902; fix on 0.1.0.1-rc. --- changes/bug7902 | 7 +++++++ src/or/reasons.c | 7 ++++++- src/or/relay.c | 6 +++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/changes/bug7902 b/changes/bug7902 new file mode 100644 index 0000000..051759d --- /dev/null +++ b/changes/bug7902 @@ -0,0 +1,7 @@ + o Minor bugfixes: + - When we receive a RELAY_END cell with the reason DONE, or with no + reason, before receiving a RELAY_CONNECTED cell, report the SOCKS + status as "connection refused." Previously we reporting these + cases as success but then immediately closing the connection. + Fixes bug 7902; bugfix on 0.1.0.1-rc. Reported by "oftc_must_ + be_destroyed." diff --git a/src/or/reasons.c b/src/or/reasons.c index 26ad12e..637f8cd 100644 --- a/src/or/reasons.c +++ b/src/or/reasons.c @@ -105,7 +105,12 @@ stream_end_reason_to_socks5_response(int reason) case END_STREAM_REASON_DESTROY: return SOCKS5_GENERAL_ERROR; case END_STREAM_REASON_DONE: - return SOCKS5_SUCCEEDED; + /* Note that 'DONE' usually indicates a successful close from the other + * side of the stream... but if we receive it before a connected cell -- + * that is, before we have sent a SOCKS reply -- that means that the + * other side of the circuit closed the connection before telling us it + * was complete. */ + return SOCKS5_CONNECTION_REFUSED; case END_STREAM_REASON_TIMEOUT: return SOCKS5_TTL_EXPIRED; case END_STREAM_REASON_NOROUTE: diff --git a/src/or/relay.c b/src/or/relay.c index bb3a835..2701263 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -734,7 +734,11 @@ connection_ap_process_end_not_open( } } - if (rh->length > 0 && edge_reason_is_retriable(reason) && + if (rh->length == 0) { + reason = END_STREAM_REASON_MISC; + } + + if (edge_reason_is_retriable(reason) && /* avoid retry if rend */ !connection_edge_is_rendezvous_stream(edge_conn)) { const char *chosen_exit_digest =

1 0

[tor/master] Adjust control_reason when adjusting reason (related to 7902)
by nickm＠torproject.org 07 Feb '13

07 Feb '13

commit e53e6caac533006245c28657f44e5c929e753336 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 16 12:52:15 2013 -0500 Adjust control_reason when adjusting reason (related to 7902) --- src/or/relay.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/or/relay.c b/src/or/relay.c index 2701263..5ac4fbf 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -710,7 +710,7 @@ connection_ap_process_end_not_open( struct in_addr in; node_t *exitrouter; int reason = *(cell->payload+RELAY_HEADER_SIZE); - int control_reason = reason | END_STREAM_REASON_FLAG_REMOTE; + int control_reason; edge_connection_t *edge_conn = ENTRY_TO_EDGE_CONN(conn); (void) layer_hint; /* unused */ @@ -738,6 +738,8 @@ connection_ap_process_end_not_open( reason = END_STREAM_REASON_MISC; } + control_reason = reason | END_STREAM_REASON_FLAG_REMOTE; + if (edge_reason_is_retriable(reason) && /* avoid retry if rend */ !connection_edge_is_rendezvous_stream(edge_conn)) {

1 0

[tor/master] Merge branch 'bug7902'
by nickm＠torproject.org 07 Feb '13

07 Feb '13

commit ad28397bbf1744993538fa96675a55bba59f2b57 Merge: 522b312 e53e6ca Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 7 15:04:11 2013 -0500 Merge branch 'bug7902' changes/bug7902 | 7 +++++++ src/or/reasons.c | 7 ++++++- src/or/relay.c | 10 ++++++++-- 3 files changed, 21 insertions(+), 3 deletions(-)

1 0

[tor/master] whitespace fix
by nickm＠torproject.org 07 Feb '13

07 Feb '13

commit 522b312a5155510fb539c9a85994ead13d2b19ce Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 7 14:31:51 2013 -0500 whitespace fix --- src/test/test_crypto.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index 273e03b..a1b5c52 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -1144,7 +1144,7 @@ struct testcase_t crypto_tests[] = { { "hkdf_sha256", test_crypto_hkdf_sha256, 0, NULL, NULL }, #ifdef CURVE25519_ENABLED { "curve25519_impl", test_crypto_curve25519_impl, 0, NULL, NULL }, - { "curve25519_impl_hibit", test_crypto_curve25519_impl, 0, NULL, (void*)"y" }, + { "curve25519_impl_hibit", test_crypto_curve25519_impl, 0, NULL, (void*)"y"}, { "curve25519_wrappers", test_crypto_curve25519_wrappers, 0, NULL, NULL }, { "curve25519_encode", test_crypto_curve25519_encode, 0, NULL, NULL }, { "curve25519_persist", test_crypto_curve25519_persist, 0, NULL, NULL },

1 0

[tor/master] Lower path use bias thresholds.
by nickm＠torproject.org 07 Feb '13

07 Feb '13

commit a99ebaf4c798ceaee4f7a57067da12ec0b17b54f Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Mon Feb 4 16:57:09 2013 -0800 Lower path use bias thresholds. I noticed bad wifi networks can have low use success rates. --- src/or/circuitbuild.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 05f9d76..e94daca 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1222,7 +1222,7 @@ pathbias_get_min_use(const or_options_t *options) static double pathbias_get_notice_use_rate(const or_options_t *options) { -#define DFLT_PATH_BIAS_NOTICE_USE_PCT 90 +#define DFLT_PATH_BIAS_NOTICE_USE_PCT 80 if (options->PathBiasNoticeUseRate >= 0.0) return options->PathBiasNoticeUseRate; else @@ -1238,7 +1238,7 @@ pathbias_get_notice_use_rate(const or_options_t *options) double pathbias_get_extreme_use_rate(const or_options_t *options) { -#define DFLT_PATH_BIAS_EXTREME_USE_PCT 70 +#define DFLT_PATH_BIAS_EXTREME_USE_PCT 60 if (options->PathBiasExtremeUseRate >= 0.0) return options->PathBiasExtremeUseRate; else

1 0

[tor/master] Update manpage for new pathbias use thresholds.
by nickm＠torproject.org 07 Feb '13

07 Feb '13

commit 2b68a06618433b8c9ddf68d2d0e78625ad8cc204 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Mon Feb 4 17:07:19 2013 -0800 Update manpage for new pathbias use thresholds. --- doc/tor.1.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index a15aecb..b95de32 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1291,8 +1291,8 @@ The following options are useful only for clients (that is, if + By default, or if a negative value is provided for one of these options, Tor uses reasonable defaults from the networkstatus consensus document. - If no defaults are available there, these options default to 20, .90, - .70, and 100, respectively. + If no defaults are available there, these options default to 20, .80, + .60, and 100, respectively. **ClientUseIPv6** **0**|**1**:: If this option is set to 1, Tor might connect to entry nodes over

1 0

[tor/master] Separate the flags for logging use bias.
by nickm＠torproject.org 07 Feb '13

07 Feb '13

commit b03553737cdfa460d33a425a53908c83fe871ec4 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Mon Feb 4 16:59:28 2013 -0800 Separate the flags for logging use bias. I think we want both sets of messages to appear independently to help us know what needs tuning. --- src/or/circuitbuild.c | 8 ++++---- src/or/entrynodes.h | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index e94daca..26edccd 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2273,8 +2273,8 @@ pathbias_measure_use_rate(entry_guard_t *guard) entry_guards_changed(); return; } - } else if (!guard->path_bias_extreme) { - guard->path_bias_extreme = 1; + } else if (!guard->path_bias_use_extreme) { + guard->path_bias_use_extreme = 1; log_warn(LD_CIRC, "Your Guard %s=%s is failing to carry an extremely large " "amount of streams on its circuits. " @@ -2297,8 +2297,8 @@ pathbias_measure_use_rate(entry_guard_t *guard) } } else if (pathbias_get_use_success_count(guard)/guard->use_attempts < pathbias_get_notice_use_rate(options)) { - if (!guard->path_bias_noticed) { - guard->path_bias_noticed = 1; + if (!guard->path_bias_use_noticed) { + guard->path_bias_use_noticed = 1; log_notice(LD_CIRC, "Your Guard %s=%s is failing to carry more streams on its " "circuits than usual. " diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h index e6c973c..b673d02 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h @@ -39,6 +39,10 @@ typedef struct entry_guard_t { * bias for this node already? */ unsigned int path_bias_disabled : 1; /**< Have we disabled this node because * of path bias issues? */ + unsigned int path_bias_use_noticed : 1; /**< Did we alert the user about path + * use bias for this node already? */ + unsigned int path_bias_use_extreme : 1; /**< Did we alert the user about path + * use bias for this node already? */ unsigned int is_dir_cache : 1; /**< Is this node a directory cache? */ time_t bad_since; /**< 0 if this guard is currently usable, or the time at * which it was observed to become (according to the

1 0