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

[tpo/master] Set Tor Browser for Android version to 8.5.6
by boklm＠torproject.org 09 Sep '19

09 Sep '19

commit b23afc4367808fdd41f4ad584c8b210e81514941 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Sep 9 17:09:26 2019 +0200 Set Tor Browser for Android version to 8.5.6 Set a separate version number on Android. We should revert this when the next stable release is published on all platforms. --- databags/versions.ini | 3 +++ templates/download-android.html | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/databags/versions.ini b/databags/versions.ini index 3a9ee37..8678372 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -2,6 +2,9 @@ version = 8.5.5 win32 = 0.4.1.5 +[torbrowser-stable-android] +version = 8.5.6 + [torbrowser-alpha] version = 9.0a6 diff --git a/templates/download-android.html b/templates/download-android.html index 71eb856..dee3912 100644 --- a/templates/download-android.html +++ b/templates/download-android.html @@ -16,7 +16,7 @@ </div> <div class="row my-5"> <div class="col-xl-6 mx-auto text-center"> - {% set t = bag('versions', 'torbrowser-stable') %} + {% set t = bag('versions', 'torbrowser-stable-android') %} <a class="btn btn-lg btn-light text-primary py-1 px-4 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk">{{ _('Download .apk') }} <small class="badge-pill badge-dark mx-1 nick">arm</small></a> <a class="btn btn-primary btn-sm nick mx-3 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk.asc"><small>sig</small></a> <a class="btn btn-lg btn-light text-primary py-1 px-4 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86-multi.apk">{{ _('Download .apk') }} <small class="badge-pill badge-dark mx-1 nick">x86</small></a>

1 0

[tor/master] backtrace: Always set a backtrace Tor version
by dgoulet＠torproject.org 09 Sep '19

09 Sep '19

commit e2a7d08aa7c51fa903d5294628612a13b4c0d6e0 Author: teor <teor(a)torproject.org> Date: Fri Aug 30 21:12:52 2019 +1000 backtrace: Always set a backtrace Tor version We want to report the tor version, even on platforms that don't have backtrace support (like Android). This commit stores the backtrace Tor version, regardless of USE_BACKTRACE. Preparation for 31571. --- src/lib/err/backtrace.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/lib/err/backtrace.c b/src/lib/err/backtrace.c index 1d1b3bcfa..8cca3c37e 100644 --- a/src/lib/err/backtrace.c +++ b/src/lib/err/backtrace.c @@ -68,10 +68,10 @@ // Redundant with util.h, but doing it here so we can avoid that dependency. #define raw_free free -#ifdef USE_BACKTRACE /** Version of Tor to report in backtrace messages. */ static char bt_version[128] = ""; +#ifdef USE_BACKTRACE /** Largest stack depth to try to dump. */ #define MAX_DEPTH 256 /** Static allocation of stack to dump. This is static so we avoid stack @@ -193,15 +193,12 @@ dump_stack_symbols_to_error_fds(void) /** Install signal handlers as needed so that when we crash, we produce a * useful stack trace. Return 0 on success, -errno on failure. */ static int -install_bt_handler(const char *software) +install_bt_handler(void) { int trap_signals[] = { SIGSEGV, SIGILL, SIGFPE, SIGBUS, SIGSYS, SIGIO, -1 }; int i, rv=0; - strncpy(bt_version, software, sizeof(bt_version) - 1); - bt_version[sizeof(bt_version) - 1] = 0; - struct sigaction sa; memset(&sa, 0, sizeof(sa)); @@ -247,9 +244,8 @@ log_backtrace_impl(int severity, int domain, const char *msg, } static int -install_bt_handler(const char *software) +install_bt_handler(void) { - (void) software; return 0; } @@ -274,7 +270,10 @@ configure_backtrace_handler(const char *tor_version) snprintf(version, sizeof(version), "Tor %s", tor_version); } - return install_bt_handler(version); + strncpy(bt_version, version, sizeof(bt_version) - 1); + bt_version[sizeof(bt_version) - 1] = 0; + + return install_bt_handler(); } /** Perform end-of-process cleanup for code that generates error messages on

1 0

[tor/master] torerr: Try harder to flush raw assert messages before process termination
by dgoulet＠torproject.org 09 Sep '19

09 Sep '19

commit c55591825fedb0fe1db92fab7b654ccc15ad50d3 Author: teor <teor(a)torproject.org> Date: Fri Aug 30 21:17:56 2019 +1000 torerr: Try harder to flush raw assert messages before process termination Some platforms (macOS, maybe others?) can swallow the last write before an abort. This issue is probably caused by a race condition between write buffer cache flushing, and process termination. So we write an extra newline, to make sure that the message always gets through. Fixes bug 31571; bugfix on 0.3.5.1-alpha. --- changes/bug31571 | 7 +++++++ src/lib/err/torerr.c | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/changes/bug31571 b/changes/bug31571 new file mode 100644 index 000000000..86de3537b --- /dev/null +++ b/changes/bug31571 @@ -0,0 +1,7 @@ + o Minor bugfixes (error handling): + - Report the tor version whenever an assertion fails. Previously, we only + reported the Tor version on some crashes, and some non-fatal assertions. + Fixes bug 31571; bugfix on 0.3.5.1-alpha. + - On abort, try harder to flush the output buffers of log messages. On + some platforms (macOS), log messages can be discarded when the process + terminates. Fixes bug 31571; bugfix on 0.3.5.1-alpha. diff --git a/src/lib/err/torerr.c b/src/lib/err/torerr.c index 88b19b732..6b5224273 100644 --- a/src/lib/err/torerr.c +++ b/src/lib/err/torerr.c @@ -146,13 +146,19 @@ tor_raw_assertion_failed_msg_(const char *file, int line, const char *expr, format_dec_number_sigsafe(line, linebuf, sizeof(linebuf)); tor_log_err_sigsafe("INTERNAL ERROR: Raw assertion failed in ", get_tor_backtrace_version(), " at ", - file, ":", linebuf, ": ", expr, NULL); + file, ":", linebuf, ": ", expr, "\n", NULL); if (msg) { tor_log_err_sigsafe_write(msg); tor_log_err_sigsafe_write("\n"); } dump_stack_symbols_to_error_fds(); + + /* Some platforms (macOS, maybe others?) can swallow the last write before an + * abort. This issue is probably caused by a race condition between write + * buffer cache flushing, and process termination. So we write an extra + * newline, to make sure that the message always gets through. */ + tor_log_err_sigsafe_write("\n"); } /* As format_{hex,dex}_number_sigsafe, but takes a <b>radix</b> argument

1 0

[tor/master] backtrace: Log the Tor backtrace version whenever we log a backtrace
by dgoulet＠torproject.org 09 Sep '19

09 Sep '19

commit 743bc0028be46e92a46b3b5e38f1e50ee69ff284 Author: teor <teor(a)torproject.org> Date: Fri Aug 30 21:15:54 2019 +1000 backtrace: Log the Tor backtrace version whenever we log a backtrace Previously, we just logged it in the crash handler. Part of 31571. --- src/lib/err/backtrace.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/err/backtrace.c b/src/lib/err/backtrace.c index 8cca3c37e..c34eb6dfa 100644 --- a/src/lib/err/backtrace.c +++ b/src/lib/err/backtrace.c @@ -127,7 +127,7 @@ log_backtrace_impl(int severity, int domain, const char *msg, depth = backtrace(cb_buf, MAX_DEPTH); symbols = backtrace_symbols(cb_buf, (int)depth); - logger(severity, domain, "%s. Stack trace:", msg); + logger(severity, domain, "%s: %s. Stack trace:", bt_version, msg); if (!symbols) { /* LCOV_EXCL_START -- we can't provoke this. */ logger(severity, domain, " Unable to generate backtrace."); @@ -240,7 +240,8 @@ void log_backtrace_impl(int severity, int domain, const char *msg, tor_log_fn logger) { - logger(severity, domain, "%s. (Stack trace not available)", msg); + logger(severity, domain, "%s: %s. (Stack trace not available)", + bt_version, msg); } static int

1 0

[tor/master] backtrace: Check the return values of snprintf() and strncpy()
by dgoulet＠torproject.org 09 Sep '19

09 Sep '19

commit f311d0676caad1c61a4dbf8fffbeb79003866903 Author: teor <teor(a)torproject.org> Date: Tue Sep 3 15:50:37 2019 +1000 backtrace: Check the return values of snprintf() and strncpy() We can't use strlcat() or strlcpy() in torerr, because they are defined in string/compat_string.h on some platforms, and string uses torerr. Part of 31571. --- src/lib/err/backtrace.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/lib/err/backtrace.c b/src/lib/err/backtrace.c index a4d8269c6..8606f4217 100644 --- a/src/lib/err/backtrace.c +++ b/src/lib/err/backtrace.c @@ -276,11 +276,23 @@ configure_backtrace_handler(const char *tor_version) char version[128] = "Tor\0"; if (tor_version) { - snprintf(version, sizeof(version), "Tor %s", tor_version); + int snp_rv = 0; + /* We can't use strlcat() here, because it is defined in + * string/compat_string.h on some platforms, and string uses torerr. */ + snp_rv = snprintf(version, sizeof(version), "Tor %s", tor_version); + /* It's safe to call raw_assert() here, because raw_assert() does not + * call configure_backtrace_handler(). */ + raw_assert(snp_rv < (int)sizeof(version)); + raw_assert(snp_rv >= 0); } - strncpy(bt_version, version, sizeof(bt_version) - 1); + char *str_rv = NULL; + /* We can't use strlcpy() here, see the note about strlcat() above. */ + str_rv = strncpy(bt_version, version, sizeof(bt_version) - 1); + /* We must terminate bt_version, then raw_assert(), because raw_assert() + * uses bt_version. */ bt_version[sizeof(bt_version) - 1] = 0; + raw_assert(str_rv == bt_version); return install_bt_handler(); }

1 0

[tor/master] torerr: Log the Tor backtrace version when a raw assertion fails
by dgoulet＠torproject.org 09 Sep '19

09 Sep '19

commit 65a1d86491d56c77048d01e0b4fc6b933a13795c Author: teor <teor(a)torproject.org> Date: Fri Aug 30 21:17:07 2019 +1000 torerr: Log the Tor backtrace version when a raw assertion fails Part of 31571. --- src/lib/err/backtrace.c | 8 ++++++++ src/lib/err/backtrace.h | 1 + src/lib/err/torerr.c | 3 ++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/lib/err/backtrace.c b/src/lib/err/backtrace.c index c34eb6dfa..a4d8269c6 100644 --- a/src/lib/err/backtrace.c +++ b/src/lib/err/backtrace.c @@ -261,6 +261,14 @@ dump_stack_symbols_to_error_fds(void) } #endif /* defined(NO_BACKTRACE_IMPL) */ +/** Return the tor version used for error messages on crashes. + * Signal-safe: returns a pointer to a static array. */ +const char * +get_tor_backtrace_version(void) +{ + return bt_version; +} + /** Set up code to handle generating error messages on crashes. */ int configure_backtrace_handler(const char *tor_version) diff --git a/src/lib/err/backtrace.h b/src/lib/err/backtrace.h index 9b313261e..48b41fca0 100644 --- a/src/lib/err/backtrace.h +++ b/src/lib/err/backtrace.h @@ -21,6 +21,7 @@ void log_backtrace_impl(int severity, int domain, const char *msg, int configure_backtrace_handler(const char *tor_version); void clean_up_backtrace_handler(void); void dump_stack_symbols_to_error_fds(void); +const char *get_tor_backtrace_version(void); #define log_backtrace(sev, dom, msg) \ log_backtrace_impl((sev), (dom), (msg), tor_log) diff --git a/src/lib/err/torerr.c b/src/lib/err/torerr.c index 54acf722a..88b19b732 100644 --- a/src/lib/err/torerr.c +++ b/src/lib/err/torerr.c @@ -144,7 +144,8 @@ tor_raw_assertion_failed_msg_(const char *file, int line, const char *expr, { char linebuf[16]; format_dec_number_sigsafe(line, linebuf, sizeof(linebuf)); - tor_log_err_sigsafe("INTERNAL ERROR: Raw assertion failed at ", + tor_log_err_sigsafe("INTERNAL ERROR: Raw assertion failed in ", + get_tor_backtrace_version(), " at ", file, ":", linebuf, ": ", expr, NULL); if (msg) { tor_log_err_sigsafe_write(msg);

1 0

[tor/master] Merge branch 'maint-0.3.5' into bug31571_035
by dgoulet＠torproject.org 09 Sep '19

09 Sep '19

commit a836dd25309935edf74d993be1d437afdccc073a Merge: f311d0676 1132dc9f7 Author: teor <teor(a)torproject.org> Date: Wed Sep 4 13:57:15 2019 +1000 Merge branch 'maint-0.3.5' into bug31571_035 changes/bug30894 | 4 ++++ changes/bug31003 | 4 ++++ changes/ticket30871 | 6 +++++ src/app/config/confparse.c | 1 + src/feature/client/entrynodes.c | 4 ++++ src/feature/nodelist/routerlist.c | 12 +++++----- src/test/test_circuitbuild.c | 47 +++++++++++++++++++++++++++++++++++++++ 7 files changed, 72 insertions(+), 6 deletions(-)

1 0

[tor/master] Merge branch 'bug31571_041' into bug31571_master
by dgoulet＠torproject.org 09 Sep '19

09 Sep '19

commit 193c74faf9c4c4dd32789e89cfd3f40291842524 Merge: 7fa624537 abe1f4f23 Author: teor <teor(a)torproject.org> Date: Wed Sep 4 13:57:39 2019 +1000 Merge branch 'bug31571_041' into bug31571_master changes/bug31571 | 7 +++++++ src/lib/err/backtrace.c | 42 +++++++++++++++++++++++++++++++----------- src/lib/err/backtrace.h | 1 + src/lib/err/torerr.c | 11 +++++++++-- 4 files changed, 48 insertions(+), 13 deletions(-)

1 0

[tor/master] Merge branch 'bug31571_035' into bug31571_040
by dgoulet＠torproject.org 09 Sep '19

09 Sep '19

commit 0cee6f498c1c9bb2f9fc05605bd0f11617d9d809 Merge: a52a5e009 a836dd253 Author: teor <teor(a)torproject.org> Date: Wed Sep 4 13:57:31 2019 +1000 Merge branch 'bug31571_035' into bug31571_040 changes/bug31571 | 7 +++++++ src/lib/err/backtrace.c | 42 +++++++++++++++++++++++++++++++----------- src/lib/err/backtrace.h | 1 + src/lib/err/torerr.c | 11 +++++++++-- 4 files changed, 48 insertions(+), 13 deletions(-)

1 0

[tor/master] Merge branch 'bug31571_040' into bug31571_041
by dgoulet＠torproject.org 09 Sep '19

09 Sep '19

commit abe1f4f23ea885b60d3a677f730d9ce11d8eb8cb Merge: e3a458e44 0cee6f498 Author: teor <teor(a)torproject.org> Date: Wed Sep 4 13:57:36 2019 +1000 Merge branch 'bug31571_040' into bug31571_041 changes/bug31571 | 7 +++++++ src/lib/err/backtrace.c | 42 +++++++++++++++++++++++++++++++----------- src/lib/err/backtrace.h | 1 + src/lib/err/torerr.c | 11 +++++++++-- 4 files changed, 48 insertions(+), 13 deletions(-) diff --cc src/lib/err/backtrace.c index e6cbe3d32,8606f4217..75d5093c5 --- a/src/lib/err/backtrace.c +++ b/src/lib/err/backtrace.c @@@ -240,10 -237,11 +237,11 @@@ remove_bt_handler(void #ifdef NO_BACKTRACE_IMPL void -log_backtrace_impl(int severity, int domain, const char *msg, +log_backtrace_impl(int severity, log_domain_mask_t domain, const char *msg, tor_log_fn logger) { - logger(severity, domain, "%s. (Stack trace not available)", msg); + logger(severity, domain, "%s: %s. (Stack trace not available)", + bt_version, msg); } static int

1 0