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

[tor/release-0.4.2] Merge branch 'maint-0.4.0' into maint-0.4.1
by teor＠torproject.org 04 Dec '19

04 Dec '19

commit cfa9cc34aa36c0f300724a01998633efbe8439ea Merge: 14089a29b 92fb09906 Author: teor <teor(a)torproject.org> Date: Thu Dec 5 10:14:01 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/bug31571 | 7 +++++++ changes/bug31810 | 4 ++++ src/lib/err/backtrace.c | 42 ++++++++++++++++++++++++++++++----------- src/lib/err/backtrace.h | 1 + src/lib/err/torerr.c | 11 +++++++++-- src/lib/process/process_unix.c | 9 +-------- src/lib/process/process_win32.c | 18 ++++++++++++++++++ src/test/test_process_slow.c | 30 +++++++++++++++++++++++++++++ 8 files changed, 101 insertions(+), 21 deletions(-) diff --cc src/lib/err/backtrace.c index 2408a6851,8606f4217..8bc7e6965 --- a/src/lib/err/backtrace.c +++ b/src/lib/err/backtrace.c @@@ -198,13 -193,12 +198,10 @@@ static int trap_signals[] = { SIGSEGV, /** 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)); @@@ -260,10 -237,11 +257,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 diff --cc src/lib/err/torerr.c index 21b28a5f6,1a246e995..b7e32a3e2 --- a/src/lib/err/torerr.c +++ b/src/lib/err/torerr.c @@@ -206,20 -163,14 +207,26 @@@ tor_raw_assertion_failed_msg_(const cha } 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"); } +/** + * Call the abort() function to kill the current process with a fatal + * error. But first, close the raw error file descriptors, so error messages + * are written before process termination. + **/ +void +tor_raw_abort_(void) +{ + tor_log_close_sigsafe_err_fds(); + abort(); +} + /* As format_{hex,dex}_number_sigsafe, but takes a <b>radix</b> argument * in range 2..16 inclusive. */ static int

1 0

[tor/release-0.4.2] Merge remote-tracking branch 'tor-github/pr/1424' into maint-0.4.0
by teor＠torproject.org 04 Dec '19

04 Dec '19

commit 46057ec5ae5ecc183fb7ed5060b8ba07ad235fb3 Merge: febbc236d ee8db8a2e Author: teor <teor(a)torproject.org> Date: Thu Dec 5 10:13:15 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1424' into maint-0.4.0 changes/bug31810 | 4 ++++ src/lib/process/process_unix.c | 9 +-------- src/lib/process/process_win32.c | 18 ++++++++++++++++++ src/test/test_process_slow.c | 30 ++++++++++++++++++++++++++++++ 4 files changed, 53 insertions(+), 8 deletions(-)

1 0

[tor/release-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2
by teor＠torproject.org 04 Dec '19

04 Dec '19

commit bb786797aa449389d47f7bf94fb5fa238e51e377 Merge: 3207a8e5c cfa9cc34a Author: teor <teor(a)torproject.org> Date: Thu Dec 5 10:14:08 2019 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2

1 0

[tor/release-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 04 Dec '19

04 Dec '19

commit 92fb0990675424cd04eb0b39b4ae157ac7f5385b Merge: 46057ec5a aee966cb0 Author: teor <teor(a)torproject.org> Date: Thu Dec 5 10:13:53 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 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/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1277' into maint-0.3.5
by teor＠torproject.org 04 Dec '19

04 Dec '19

commit aee966cb06711a413980b8cf7fa359e69d62dd05 Merge: 62cf12a8b f311d0676 Author: teor <teor(a)torproject.org> Date: Thu Dec 5 10:11:18 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1277' into maint-0.3.5 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/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1424' into maint-0.4.0
by teor＠torproject.org 04 Dec '19

04 Dec '19

commit 46057ec5ae5ecc183fb7ed5060b8ba07ad235fb3 Merge: febbc236d ee8db8a2e Author: teor <teor(a)torproject.org> Date: Thu Dec 5 10:13:15 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1424' into maint-0.4.0 changes/bug31810 | 4 ++++ src/lib/process/process_unix.c | 9 +-------- src/lib/process/process_win32.c | 18 ++++++++++++++++++ src/test/test_process_slow.c | 30 ++++++++++++++++++++++++++++++ 4 files changed, 53 insertions(+), 8 deletions(-)

1 0

[tor/maint-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2
by teor＠torproject.org 04 Dec '19

04 Dec '19

commit bb786797aa449389d47f7bf94fb5fa238e51e377 Merge: 3207a8e5c cfa9cc34a Author: teor <teor(a)torproject.org> Date: Thu Dec 5 10:14:08 2019 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2

1 0

[tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 04 Dec '19

04 Dec '19

commit 92fb0990675424cd04eb0b39b4ae157ac7f5385b Merge: 46057ec5a aee966cb0 Author: teor <teor(a)torproject.org> Date: Thu Dec 5 10:13:53 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 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/maint-0.4.2] Merge branch 'maint-0.4.0' into maint-0.4.1
by teor＠torproject.org 04 Dec '19

04 Dec '19

commit cfa9cc34aa36c0f300724a01998633efbe8439ea Merge: 14089a29b 92fb09906 Author: teor <teor(a)torproject.org> Date: Thu Dec 5 10:14:01 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/bug31571 | 7 +++++++ changes/bug31810 | 4 ++++ src/lib/err/backtrace.c | 42 ++++++++++++++++++++++++++++++----------- src/lib/err/backtrace.h | 1 + src/lib/err/torerr.c | 11 +++++++++-- src/lib/process/process_unix.c | 9 +-------- src/lib/process/process_win32.c | 18 ++++++++++++++++++ src/test/test_process_slow.c | 30 +++++++++++++++++++++++++++++ 8 files changed, 101 insertions(+), 21 deletions(-) diff --cc src/lib/err/backtrace.c index 2408a6851,8606f4217..8bc7e6965 --- a/src/lib/err/backtrace.c +++ b/src/lib/err/backtrace.c @@@ -198,13 -193,12 +198,10 @@@ static int trap_signals[] = { SIGSEGV, /** 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)); @@@ -260,10 -237,11 +257,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 diff --cc src/lib/err/torerr.c index 21b28a5f6,1a246e995..b7e32a3e2 --- a/src/lib/err/torerr.c +++ b/src/lib/err/torerr.c @@@ -206,20 -163,14 +207,26 @@@ tor_raw_assertion_failed_msg_(const cha } 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"); } +/** + * Call the abort() function to kill the current process with a fatal + * error. But first, close the raw error file descriptors, so error messages + * are written before process termination. + **/ +void +tor_raw_abort_(void) +{ + tor_log_close_sigsafe_err_fds(); + abort(); +} + /* As format_{hex,dex}_number_sigsafe, but takes a <b>radix</b> argument * in range 2..16 inclusive. */ static int

1 0

[tor/maint-0.4.2] Handle errors from execve() in the Unix process backend more gracefully.
by teor＠torproject.org 04 Dec '19

04 Dec '19

commit 9915b8f0bc3e6a1b6c8413fbb87c41137ea89104 Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Oct 17 16:39:05 2019 +0200 Handle errors from execve() in the Unix process backend more gracefully. This patch removes a call to tor_assert_unreached() after execve() failed. This assertion leads to the child process emitting a stack trace on its standard output, which makes the error harder for the user to demystify, since they think it is an internal error in Tor instead of "just" being a "no such file or directory" error. The process will now instead output "Error from child process: X" where X is the stringified version of the errno value. See: https://bugs.torproject.org/31810 --- changes/bug31810 | 4 ++++ src/lib/process/process_unix.c | 9 +-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/changes/bug31810 b/changes/bug31810 new file mode 100644 index 000000000..628d12f09 --- /dev/null +++ b/changes/bug31810 @@ -0,0 +1,4 @@ + o Minor bugfixes (process management): + - Remove assertion in the Unix process backend. This assertion would trigger + when a new process is spawned where the executable is not found leading to + a stack trace from the child process. Fixes bug 31810; bugfix on 0.4.0.1-alpha. diff --git a/src/lib/process/process_unix.c b/src/lib/process/process_unix.c index 790ab897e..b102afff4 100644 --- a/src/lib/process/process_unix.c +++ b/src/lib/process/process_unix.c @@ -253,22 +253,15 @@ process_unix_exec(process_t *process) process_environment_t *env = process_get_environment(process); /* Call the requested program. */ - retval = execve(argv[0], argv, env->unixoid_environment_block); + execve(argv[0], argv, env->unixoid_environment_block); /* If we made it here it is because execve failed :-( */ - if (-1 == retval) - fprintf(stderr, "Call to execve() failed: %s", strerror(errno)); - tor_free(argv); process_environment_free(env); - tor_assert_unreached(); - error: - /* LCOV_EXCL_START */ fprintf(stderr, "Error from child process: %s", strerror(errno)); _exit(1); - /* LCOV_EXCL_STOP */ } /* We are in the parent process. */

1 0