March 2015 - tor-commits - lists.torproject.org

[tor/maint-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit 8a060d8643ff5a84cd8593f49af8221ef0855d36 Merge: 1a1d431 eecd410 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 12:27:42 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

1 0

[tor/maint-0.2.5] Make TransProxyType ipfw work correctly
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit 681802817deb6fb93b95f8284856fd42f3556600 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 4 12:24:51 2015 +0100 Make TransProxyType ipfw work correctly Fixes bug 15064; bugfix on 0.2.5.4-alpha. --- changes/bug15064 | 4 ++++ src/or/connection_edge.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug15064 b/changes/bug15064 new file mode 100644 index 0000000..e6bd747 --- /dev/null +++ b/changes/bug15064 @@ -0,0 +1,4 @@ + o Major bugfixes (FreeBSD IPFW transparent proxy): + - Fix address detection with FreeBSD transparent proxies, + when "TransProxyType ipfw" is in use. + Fixes bug 15064; bugfix on 0.2.5.4-alpha. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 49f9ba4..1eeb22f 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1531,7 +1531,8 @@ connection_ap_get_original_destination(entry_connection_t *conn, if (options->TransProxyType_parsed == TPT_PF_DIVERT) return destination_from_socket(conn, req); - if (options->TransProxyType_parsed == TPT_DEFAULT) + if (options->TransProxyType_parsed == TPT_DEFAULT || + options->TransProxyType_parsed == TPT_IPFW) return destination_from_pf(conn, req); (void)conn;

1 0

[tor/maint-0.2.5] Don't use checked strl{cat, cpy} on OSX.
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit 24c031b1a28658c921a746f4d58f3ca5e9994108 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 15:09:49 2015 -0400 Don't use checked strl{cat,cpy} on OSX. There is a bug in the overlap-checking in strlcat that can crash Tor servers. Fixes bug 15205; this is an OSX bug, not a Tor bug. --- changes/bug15205 | 5 +++++ src/common/compat.h | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/changes/bug15205 b/changes/bug15205 new file mode 100644 index 0000000..0cb9f3f --- /dev/null +++ b/changes/bug15205 @@ -0,0 +1,5 @@ + o Major bugfixes (crash, OSX, security): + - Fix a remote denial-of-service opportunity caused by a bug + in OSX's _strlcat_chk() function. Fixes bug 15205; bug first + appeared in OSX 10.9. + diff --git a/src/common/compat.h b/src/common/compat.h index ec7d241..531e88f 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -224,6 +224,18 @@ extern INLINE double U64_TO_DBL(uint64_t x) { #define strncasecmp _strnicmp #define strcasecmp _stricmp #endif + +#if defined __APPLE__ +/* On OSX 10.9 and later, the overlap-checking code for strlcat would + * appear to have a severe bug that can sometimes cause aborts in Tor. + * Instead, use the non-checking variants. This is sad. + * + * See https://trac.torproject.org/projects/tor/ticket/15205 + */ +#undef strlcat +#undef strlcpy +#endif + #ifndef HAVE_STRLCAT size_t strlcat(char *dst, const char *src, size_t siz) ATTR_NONNULL((1,2)); #endif

1 0

[tor/maint-0.2.5] Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.5
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit eecd410984e3f1741dda877fe482e082a41db700 Merge: a00d07a 24c031b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 12:27:25 2015 -0400 Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.5 changes/bug15064 | 4 ++++ changes/bug15205 | 5 +++++ src/common/compat.h | 12 ++++++++++++ src/or/connection_edge.c | 3 ++- 4 files changed, 23 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.6] Fix check-spaces
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit 985687bc4f99b90ed88ccdbefc820260c299ff23 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 10 10:10:35 2015 -0400 Fix check-spaces --- src/common/container.h | 1 - src/test/test_status.c | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/common/container.h b/src/common/container.h index d07697f..457b5e4 100644 --- a/src/common/container.h +++ b/src/common/container.h @@ -256,7 +256,6 @@ char *smartlist_join_strings2(smartlist_t *sl, const char *join, --var ## _sl_len; \ STMT_END - /** Helper: While in a SMARTLIST_FOREACH loop over the list sl indexed * with the variable var, replace the current element with val. * Does not deallocate the current value of var. diff --git a/src/test/test_status.c b/src/test/test_status.c index 0aa82ca..cb3b4f6 100644 --- a/src/test/test_status.c +++ b/src/test/test_status.c @@ -878,7 +878,8 @@ NS(logv)(int severity, log_domain_mask_t domain, const char *funcname, tt_ptr_op(strstr(funcname, "log_heartbeat"), OP_NE, NULL); tt_ptr_op(suffix, OP_EQ, NULL); tt_str_op(format, OP_EQ, - "Average packaged cell fullness: %2.3f%%. TLS write overhead: %.f%%"); + "Average packaged cell fullness: %2.3f%%. " + "TLS write overhead: %.f%%"); tt_double_op(fabs(va_arg(ap, double) - 50.0), <=, DBL_EPSILON); tt_double_op(fabs(va_arg(ap, double) - 0.0), <=, DBL_EPSILON); break; @@ -1026,7 +1027,8 @@ NS(logv)(int severity, log_domain_mask_t domain, tt_ptr_op(strstr(funcname, "log_heartbeat"), OP_NE, NULL); tt_ptr_op(suffix, OP_EQ, NULL); tt_str_op(format, OP_EQ, - "Average packaged cell fullness: %2.3f%%. TLS write overhead: %.f%%"); + "Average packaged cell fullness: %2.3f%%. " + "TLS write overhead: %.f%%"); tt_int_op(fabs(va_arg(ap, double) - 100.0) <= DBL_EPSILON, OP_EQ, 1); tt_double_op(fabs(va_arg(ap, double) - 100.0), <=, DBL_EPSILON); break;

1 0

[tor/release-0.2.6] Use PTHREAD_CREATE_DETACHED macro instead of 1: fix Solaris crash
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit 192ed944101174d775d27ac54002ee9bc2708080 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 09:49:45 2015 -0400 Use PTHREAD_CREATE_DETACHED macro instead of 1: fix Solaris crash When calling pthread_attr_setdetachstate, we were using 1 as the argument. But the pthreads documentation says that you have to say PTHREAD_CREATE_DETACH, which on Solaris is apparently 0x40. Calling pthread_attr_setdetachstate with 1 crashes on Solaris with FLTBOUNDS. (Because we're so late in the release cycle, I made the code define PTHREAD_CREATE_DETACHED if it doesn't exist, so we aren't likely to break any other platforms.) This bug was introduced when we made threading mandatory in 0.2.6.1-alpha; previously, we had force-disabled threading on Solaris. See #9495 discussion. --- changes/bug9495_redux | 4 ++++ src/common/compat_pthreads.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug9495_redux b/changes/bug9495_redux new file mode 100644 index 0000000..74b0cdf --- /dev/null +++ b/changes/bug9495_redux @@ -0,0 +1,4 @@ + o Major bugfixes (portability): + - Do not crash on startup when running on Solaris. Fixes a bug + related to our fix for 9495; bugfix on 0.2.6.1-alpha. Reported + by "ruebezahl". diff --git a/src/common/compat_pthreads.c b/src/common/compat_pthreads.c index f4a6cad..246076b 100644 --- a/src/common/compat_pthreads.c +++ b/src/common/compat_pthreads.c @@ -279,7 +279,11 @@ tor_threads_init(void) pthread_mutexattr_init(&attr_recursive); pthread_mutexattr_settype(&attr_recursive, PTHREAD_MUTEX_RECURSIVE); tor_assert(0==pthread_attr_init(&attr_detached)); - tor_assert(0==pthread_attr_setdetachstate(&attr_detached, 1)); +#ifndef PTHREAD_CREATE_DETACHED +#define PTHREAD_CREATE_DETACHED 1 +#endif + tor_assert(0==pthread_attr_setdetachstate(&attr_detached, + PTHREAD_CREATE_DETACHED)); threads_initialized = 1; set_main_thread(); }

1 0

[tor/release-0.2.6] Merge branch 'bug9495_redux_v2' into maint-0.2.6
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit a95e18b3589a2ebc4b9a5c741c37bdf083d5057d Merge: 985687b 192ed94 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 10:05:06 2015 -0400 Merge branch 'bug9495_redux_v2' into maint-0.2.6 changes/bug9495_redux | 4 ++++ src/common/compat_pthreads.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit 354897a13e46cc06cb86eb1451a6d356d0402f42 Merge: a95e18b a00d07a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 10:54:13 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

1 0

[tor/release-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit b563082ad87448066f950fe581b47f1533b78341 Merge: 306f2f0 5f46a59 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 10:51:08 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

1 0

[tor/release-0.2.6] Also, add an assertion to assign_onionskin_to_cpuworker
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit 648af0438d4a293f12b649afc47dd947a7666a05 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 11:15:50 2015 -0400 Also, add an assertion to assign_onionskin_to_cpuworker --- src/or/cpuworker.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index 588eae9..e3781ad 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -488,6 +488,8 @@ assign_onionskin_to_cpuworker(or_circuit_t *circ, cpuworker_request_t req; int should_time; + tor_assert(threadpool); + if (!circ->p_chan) { log_info(LD_OR,"circ->p_chan gone. Failing circ."); tor_free(onionskin);

1 0