June 2018 - tor-commits - lists.torproject.org

[tor/master] Use raw_assert() in write_all().
by nickm＠torproject.org 20 Jun '18

20 Jun '18

commit 057d838409be7d908ce14979a2b486601fad8c08 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 20 15:09:42 2018 -0400 Use raw_assert() in write_all(). This makes tor_log() finally non-circular. --- src/common/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/util.c b/src/common/util.c index cee6a4a23..4fd07fabc 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2102,7 +2102,7 @@ write_all(tor_socket_t fd, const char *buf, size_t count, int isSocket) { size_t written = 0; ssize_t result; - tor_assert(count < SSIZE_MAX); + raw_assert(count < SSIZE_MAX); while (written != count) { if (isSocket)

1 0

[tor/master] Changes file for logging circularity fixes.
by nickm＠torproject.org 20 Jun '18

20 Jun '18

commit 50fb8301c15eb291b23d9b82dba00d285cedbb37 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 20 15:11:57 2018 -0400 Changes file for logging circularity fixes. --- changes/ticket26427 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/changes/ticket26427 b/changes/ticket26427 new file mode 100644 index 000000000..ff33f7bd4 --- /dev/null +++ b/changes/ticket26427 @@ -0,0 +1,6 @@ + o Minor features (code layout): + - Make a new lowest-level error-handling API for use by code invoked + from within the logging module. This interface it makes it so + the logging code is no longer at risk of calling into itself if + a failure occurs while trying to log something. + Closes ticket 26427.

1 0

[tor/master] Use raw_assert() in central allocation functions.
by nickm＠torproject.org 20 Jun '18

20 Jun '18

commit 7a2dce90062187cac332cda2ca336db6547fe60b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 20 14:19:00 2018 -0400 Use raw_assert() in central allocation functions. This is, again, to avoid circularity in the log code. --- src/common/container.c | 3 +-- src/common/util.c | 31 ++++++++++++++----------------- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/src/common/container.c b/src/common/container.c index b1a2ac799..c66ea012a 100644 --- a/src/common/container.c +++ b/src/common/container.c @@ -73,7 +73,7 @@ smartlist_ensure_capacity(smartlist_t *sl, size_t size) #define MAX_CAPACITY (int)((SIZE_MAX / (sizeof(void*)))) #endif - tor_assert(size <= MAX_CAPACITY); + raw_assert(size <= MAX_CAPACITY); if (size > (size_t) sl->capacity) { size_t higher = (size_t) sl->capacity; @@ -1538,4 +1538,3 @@ digestset_free_(digestset_t *set) bitarray_free(set->ba); tor_free(set); } - diff --git a/src/common/util.c b/src/common/util.c index 5a477eeba..cee6a4a23 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -112,7 +112,7 @@ tor_malloc_(size_t size) { void *result; - tor_assert(size < SIZE_T_CEILING); + raw_assert(size < SIZE_T_CEILING); #ifndef MALLOC_ZERO_WORKS /* Some libc mallocs don't work when size==0. Override them. */ @@ -125,11 +125,10 @@ tor_malloc_(size_t size) if (PREDICT_UNLIKELY(result == NULL)) { /* LCOV_EXCL_START */ - log_err(LD_MM,"Out of memory on malloc(). Dying."); /* If these functions die within a worker process, they won't call * spawn_exit, but that's ok, since the parent will run out of memory soon * anyway. */ - exit(1); // exit ok: alloc failed. + raw_assert_unreached_msg("Out of memory on malloc(). Dying."); /* LCOV_EXCL_STOP */ } return result; @@ -186,7 +185,7 @@ size_mul_check(const size_t x, const size_t y) void * tor_calloc_(size_t nmemb, size_t size) { - tor_assert(size_mul_check(nmemb, size)); + raw_assert(size_mul_check(nmemb, size)); return tor_malloc_zero_((nmemb * size)); } @@ -199,7 +198,7 @@ tor_realloc_(void *ptr, size_t size) { void *result; - tor_assert(size < SIZE_T_CEILING); + raw_assert(size < SIZE_T_CEILING); #ifndef MALLOC_ZERO_WORKS /* Some libc mallocs don't work when size==0. Override them. */ @@ -212,8 +211,7 @@ tor_realloc_(void *ptr, size_t size) if (PREDICT_UNLIKELY(result == NULL)) { /* LCOV_EXCL_START */ - log_err(LD_MM,"Out of memory on realloc(). Dying."); - exit(1); // exit ok: alloc failed. + raw_assert_unreached_msg("Out of memory on realloc(). Dying."); /* LCOV_EXCL_STOP */ } return result; @@ -228,7 +226,7 @@ tor_reallocarray_(void *ptr, size_t sz1, size_t sz2) { /* XXXX we can make this return 0, but we would need to check all the * reallocarray users. */ - tor_assert(size_mul_check(sz1, sz2)); + raw_assert(size_mul_check(sz1, sz2)); return tor_realloc(ptr, (sz1 * sz2)); } @@ -241,14 +239,13 @@ char * tor_strdup_(const char *s) { char *duplicate; - tor_assert(s); + raw_assert(s); duplicate = raw_strdup(s); if (PREDICT_UNLIKELY(duplicate == NULL)) { /* LCOV_EXCL_START */ - log_err(LD_MM,"Out of memory on strdup(). Dying."); - exit(1); // exit ok: alloc failed. + raw_assert_unreached_msg("Out of memory on strdup(). Dying."); /* LCOV_EXCL_STOP */ } return duplicate; @@ -264,8 +261,8 @@ char * tor_strndup_(const char *s, size_t n) { char *duplicate; - tor_assert(s); - tor_assert(n < SIZE_T_CEILING); + raw_assert(s); + raw_assert(n < SIZE_T_CEILING); duplicate = tor_malloc_((n+1)); /* Performance note: Ordinarily we prefer strlcpy to strncpy. But * this function gets called a whole lot, and platform strncpy is @@ -282,8 +279,8 @@ void * tor_memdup_(const void *mem, size_t len) { char *duplicate; - tor_assert(len < SIZE_T_CEILING); - tor_assert(mem); + raw_assert(len < SIZE_T_CEILING); + raw_assert(mem); duplicate = tor_malloc_(len); memcpy(duplicate, mem, len); return duplicate; @@ -295,8 +292,8 @@ void * tor_memdup_nulterm_(const void *mem, size_t len) { char *duplicate; - tor_assert(len < SIZE_T_CEILING+1); - tor_assert(mem); + raw_assert(len < SIZE_T_CEILING+1); + raw_assert(mem); duplicate = tor_malloc_(len+1); memcpy(duplicate, mem, len); duplicate[len] = '\0';

1 0

[tor/master] Allow raw_assert() to dump stack traces.
by nickm＠torproject.org 20 Jun '18

20 Jun '18

commit bb15dc1ebd520cb902124c982abbba135af183b5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 20 14:04:03 2018 -0400 Allow raw_assert() to dump stack traces. It doesn't do this as beautifully as tor_assert(), but it doesn't depend on any higher-level code. --- src/common/backtrace.c | 20 ++++++++++++++++++++ src/common/backtrace.h | 1 + src/common/torerr.c | 3 +++ 3 files changed, 24 insertions(+) diff --git a/src/common/backtrace.c b/src/common/backtrace.c index af939b0a8..d83cbba0e 100644 --- a/src/common/backtrace.c +++ b/src/common/backtrace.c @@ -167,6 +167,21 @@ crash_handler(int sig, siginfo_t *si, void *ctx_) abort(); } +/** Write a backtrace to all of the emergency-error fds. */ +void +dump_stack_symbols_to_error_fds(void) +{ + int n_fds, i; + const int *fds = NULL; + size_t depth; + + depth = backtrace(cb_buf, MAX_DEPTH); + + n_fds = tor_log_get_sigsafe_err_fds(&fds); + for (i=0; i < n_fds; ++i) + backtrace_symbols_fd(cb_buf, (int)depth, fds[i]); +} + /** 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 @@ -234,6 +249,11 @@ static void remove_bt_handler(void) { } + +void +dump_stack_symbols_to_error_fds(void) +{ +} #endif /* defined(NO_BACKTRACE_IMPL) */ /** Set up code to handle generating error messages on crashes. */ diff --git a/src/common/backtrace.h b/src/common/backtrace.h index 7182aeb07..0a145fc92 100644 --- a/src/common/backtrace.h +++ b/src/common/backtrace.h @@ -14,6 +14,7 @@ void log_backtrace_impl(int severity, int domain, const char *msg, tor_log_fn logger); int configure_backtrace_handler(const char *tor_version); void clean_up_backtrace_handler(void); +void dump_stack_symbols_to_error_fds(void); #define log_backtrace(sev, dom, msg) \ log_backtrace_impl((sev), (dom), (msg), tor_log) diff --git a/src/common/torerr.c b/src/common/torerr.c index c22526254..5dbdc629a 100644 --- a/src/common/torerr.c +++ b/src/common/torerr.c @@ -29,6 +29,7 @@ #endif #include "common/torerr.h" +#include "common/backtrace.h" /** Array of fds to log crash-style warnings to. */ static int sigsafe_log_fds[TOR_SIGSAFE_LOG_MAX_FDS] = { STDERR_FILENO }; @@ -140,6 +141,8 @@ tor_raw_assertion_failed_msg_(const char *file, int line, const char *expr, tor_log_err_sigsafe_write(msg); tor_log_err_sigsafe_write("\n"); } + + dump_stack_symbols_to_error_fds(); } /* As format_{hex,dex}_number_sigsafe, but takes a <b>radix</b> argument

1 0

[tor/master] Don't use any asserts(), even raw, in format_number_sigsafe().
by nickm＠torproject.org 20 Jun '18

20 Jun '18

commit c86850c4c9e8154fdd6e0be53f455a573df17155 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 20 16:11:09 2018 -0400 Don't use any asserts(), even raw, in format_number_sigsafe(). Also explain why. --- src/common/torerr.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/common/torerr.c b/src/common/torerr.c index 5dbdc629a..0e0c4db35 100644 --- a/src/common/torerr.c +++ b/src/common/torerr.c @@ -155,8 +155,9 @@ format_number_sigsafe(unsigned long x, char *buf, int buf_len, int len; char *cp; - /* NOT tor_assert. This needs to be safe to run from within a signal handler, - * and from within the 'tor_assert() has failed' code. */ + /* NOT tor_assert. This needs to be safe to run from within a signal + * handler, and from within the 'tor_assert() has failed' code. Not even + * raw_assert(), since raw_assert() calls this function on failure. */ if (radix < 2 || radix > 16) return 0; @@ -176,7 +177,10 @@ format_number_sigsafe(unsigned long x, char *buf, int buf_len, *cp = '\0'; do { unsigned digit = (unsigned) (x % radix); - raw_assert(cp > buf); + if (cp <= buf) { + /* Not tor_assert(); see above. */ + abort(); + } --cp; *cp = "0123456789ABCDEF"[digit]; x /= radix;

1 0

[tor-browser-build/maint-7.5] Prepating build2 with fix for #26428
by gk＠torproject.org 20 Jun '18

20 Jun '18

commit 1d5a375834a1fc1884145591d4fb63623b071486 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 20 19:46:00 2018 +0000 Prepating build2 with fix for #26428 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 + rbm.conf | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index f7160bf..84f2c76 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -5,6 +5,7 @@ Tor Browser 7.5.6 -- June 26 2018 * Update Tor Launcher to 0.2.14.5 * Bug 20890: Increase control port connection timeout * Update HTTPS Everywhere to 2018.6.13 + * Bug 26428: Work around HTTPS Everywhere caused build bustage * Update NoScript to 5.1.8.6 * Bug 21537: Mark .onion cookies as secure * Bug 25938: Backport fix for cross-origin header leak (bug 1334776) diff --git a/rbm.conf b/rbm.conf index 5a90617..079c216 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '7.5.6' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 7.5.4 - 7.5.5

1 0

[tor-browser-build/maint-7.5] Bug 26428: add temporary fix to avoid https-e submodule error
by gk＠torproject.org 20 Jun '18

20 Jun '18

commit b3cc97d4e4adb4709c1e367d82bd1e389bba60f0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jun 20 19:14:27 2018 +0200 Bug 26428: add temporary fix to avoid https-e submodule error --- projects/https-everywhere/config | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 2385c5c..c55933e 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,10 +1,12 @@ # vim: filetype=yaml sw=2 version: 2018.6.13 -git_url: https://git.torproject.org/https-everywhere.git -git_hash: '[% c("version") %]' +git_url: https://github.com/boklm/https-everywhere +# Temporary fix for #26428 +git_hash: 53091373b8e4a78504dd2ddc55f953a267a7de87 git_submodule: 1 gpg_keyring: https-everywhere.gpg -tag_gpg_id: 1 +# Temporarily disable gpg check for #26428 +#tag_gpg_id: 1 filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].xpi" var: # HTTPS Everywhere is expected to be the same on all platforms. To avoid

1 0

[tor/master] fix a changes file warning
by nickm＠torproject.org 20 Jun '18

20 Jun '18

commit e4e949e901400c8516a2db8d2fd508b1e7bb842e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 20 10:20:44 2018 -0400 fix a changes file warning --- changes/full_include_paths | 1 - 1 file changed, 1 deletion(-) diff --git a/changes/full_include_paths b/changes/full_include_paths index 7fb4de236..c0ac0a05d 100644 --- a/changes/full_include_paths +++ b/changes/full_include_paths @@ -1,4 +1,3 @@ - o Code simplification and refactoring: - Include paths to header files within Tor are now qualified by directory within the top-level src directory.

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 20 Jun '18

20 Jun '18

commit c6b2c2c12adcfdb763c8ea8a3f6f3e537f2e2836 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 20 14:17:17 2018 +0000 Update translations for torbutton-torbuttonproperties --- it/torbutton.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/it/torbutton.properties b/it/torbutton.properties index 8cc300f66..aa1279b75 100644 --- a/it/torbutton.properties +++ b/it/torbutton.properties @@ -54,5 +54,5 @@ profileAccessDenied=%S non ha i permessi per accedere al profilo. Per favore, mo profileMigrationFailed=Migrazione del tuo profilo %S esistente fallita.\nVerranno usate nuove impostazioni. # .Onion Page Info prompt. Strings are kept here for ease of translation. -pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S) -pageInfo_OnionEncryption=Connection Encrypted (Onion Service) +pageInfo_OnionEncryptionWithBitsAndProtocol=Connessione cifrata (Servizio onion, %1$S, chiavi %2$S bit, %3$S) +pageInfo_OnionEncryption=Connessione cifrata (Servizio onion)

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 20 Jun '18

20 Jun '18

commit 3c639fd7eccc4dba616a46ac924412a9cff8aa7d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 20 14:15:41 2018 +0000 Update translations for https_everywhere_completed --- it/ssl-observatory.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/it/ssl-observatory.dtd b/it/ssl-observatory.dtd index 031f38520..c04b56096 100644 --- a/it/ssl-observatory.dtd +++ b/it/ssl-observatory.dtd @@ -87,7 +87,7 @@ www.qualcosa.com, ma non chi ha visitato il sito, o quale particolare pagina <!ENTITY ssl-observatory.warning.title "AVVISO dall'Osservatorio SSL di EFF"> <!ENTITY ssl-observatory.warning.showcert "Mostrare la catena di certificati"> <!ENTITY ssl-observatory.warning.okay "Capisco"> -<!ENTITY ssl-observatory.warning.text "L'Osservatorio SSL di EFF ha emesso un avviso sui certificati HTTPS di questo sito:"> +<!ENTITY ssl-observatory.warning.text "L'Osservatorio SSL della EFF ha emesso un avvertimento riguardo il certificato HTTPS di questo sito:"> <!ENTITY ssl-observatory.warning.defense "Nel caso si sia effettuato l'accesso a questo sito, è consigliabile cambiare la password non appena si dispone di una connessione sicura. (Questi avvisi possono essere disabilitati nella scheda "Osservatorio SSL" delle preferenze di HTTPS Everywhere.)"> <!ENTITY ssl-observatory.prefs.self_signed

1 0