tor-commits October 2019

tor-commits@lists.torproject.org

22 participants
4141 discussions

[tor/maint-0.4.2] Ensure that the exit callback is called if CreateProcessA() fails on Windows.
by nickm＠torproject.org 18 Oct '19

18 Oct '19

commit 7a64f6ea049747385acf77985ad4df5fa497b3e1 Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Oct 17 16:47:04 2019 +0200 Ensure that the exit callback is called if CreateProcessA() fails on Windows. This patch fixes an issue where the exit handler is not called for the given process_t in case CreateProcessA() fails. This could, for example, happen if the user tries to execute a binary that does not exist. See: https://bugs.torproject.org/31810 --- src/lib/process/process_win32.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/lib/process/process_win32.c b/src/lib/process/process_win32.c index 624333d4a..7e4082ad1 100644 --- a/src/lib/process/process_win32.c +++ b/src/lib/process/process_win32.c @@ -234,6 +234,24 @@ process_win32_exec(process_t *process) CloseHandle(stdin_pipe_read); CloseHandle(stdin_pipe_write); + /* In the Unix backend, we do not get an error in the Tor process when a + * child process fails to spawn its target executable since we need to + * first do the fork() call in the Tor process and then the child process + * is responsible for doing the call to execve(). + * + * This means that the user of the process_exec() API must check for + * whether it returns PROCESS_STATUS_ERROR, which will rarely happen on + * Unix, but will happen for error cases on Windows where it does not + * happen on Unix. For example: when the target executable does not exist + * on the file system. + * + * To have somewhat feature compatibility between the Unix and the Windows + * backend, we here notify the process_t owner that the process have exited + * (even though it never managed to run) to ensure that the exit callback + * is executed. + */ + process_notify_event_exit(process, 0); + return PROCESS_STATUS_ERROR; }

1 0

[tor/maint-0.4.2] Bump practracker exception limit for process_win32_exec().
by nickm＠torproject.org 18 Oct '19

18 Oct '19

commit 95e3527df0d5d6f5da88df5ef2629d61cc7c689a Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Oct 17 21:12:51 2019 +0200 Bump practracker exception limit for process_win32_exec(). I have added a larger comment there and one line of code, so I think this bump is reasonable. See: https://bugs.torproject.org/31810 --- scripts/maint/practracker/exceptions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index dcea3a3f4..7b15b37f8 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -311,7 +311,7 @@ problem function-size /src/lib/net/inaddr.c:tor_inet_pton() 107 problem function-size /src/lib/net/socketpair.c:tor_ersatz_socketpair() 102 problem function-size /src/lib/osinfo/uname.c:get_uname() 116 problem function-size /src/lib/process/process_unix.c:process_unix_exec() 220 -problem function-size /src/lib/process/process_win32.c:process_win32_exec() 133 +problem function-size /src/lib/process/process_win32.c:process_win32_exec() 151 problem function-size /src/lib/process/process_win32.c:process_win32_create_pipe() 109 problem function-size /src/lib/process/restrict.c:set_max_file_descriptors() 102 problem function-size /src/lib/process/setuid.c:switch_id() 156

1 0

[tor/maint-0.4.2] Add test to check if the exit callback is called in process_t upon process_exec() failures.
by nickm＠torproject.org 18 Oct '19

18 Oct '19

commit 4ed06acb2ada14e424f453c24c477659b4cb7cbf Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Oct 17 16:56:21 2019 +0200 Add test to check if the exit callback is called in process_t upon process_exec() failures. This patch adds a test to check for whether the exit callback is always called when process_exec() fails, both on Windows and Unix. See: https://bugs.torproject.org/31810 --- src/test/test_process_slow.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/test/test_process_slow.c b/src/test/test_process_slow.c index 91252c725..f311e8b29 100644 --- a/src/test/test_process_slow.c +++ b/src/test/test_process_slow.c @@ -328,8 +328,38 @@ test_callbacks_terminate(void *arg) process_free(process); } +static void +test_nonexistent_executable(void *arg) +{ + (void)arg; + + /* Process callback data. */ + process_data_t *process_data = process_data_new(); + + /* Setup our process. */ + process_t *process = process_new("binary-does-not-exist"); + process_set_data(process, process_data); + process_set_exit_callback(process, process_exit_callback); + + /* Run our process. */ + process_exec(process); + + /* Start our main loop. */ + run_main_loop(process_data); + + /* Ensure that the exit callback was actually called even though the binary + * did not exist. + */ + tt_assert(process_data->did_exit); + + done: + process_data_free(process_data); + process_free(process); +} + struct testcase_t slow_process_tests[] = { { "callbacks", test_callbacks, 0, NULL, NULL }, { "callbacks_terminate", test_callbacks_terminate, 0, NULL, NULL }, + { "nonexistent_executable", test_nonexistent_executable, 0, NULL, NULL }, END_OF_TESTCASES };

1 0

[tor/master] Ensure that the exit callback is called if CreateProcessA() fails on Windows.
by nickm＠torproject.org 18 Oct '19

18 Oct '19

1 0

[tor/master] Add test to check if the exit callback is called in process_t upon process_exec() failures.
by nickm＠torproject.org 18 Oct '19

18 Oct '19

1 0

[tor/master] Merge branch 'maint-0.4.2'
by nickm＠torproject.org 18 Oct '19

18 Oct '19

commit 264c5312eb7fc70b092b22ec978c1b400b7fd826 Merge: 7c5716d16 0994050c4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 18 12:32:49 2019 -0400 Merge branch 'maint-0.4.2' changes/bug31810 | 4 ++++ scripts/maint/practracker/exceptions.txt | 2 +- src/lib/process/process_unix.c | 9 +-------- src/lib/process/process_win32.c | 18 ++++++++++++++++++ src/test/test_process_slow.c | 30 ++++++++++++++++++++++++++++++ 5 files changed, 54 insertions(+), 9 deletions(-)

1 0

[tor/master] Bump practracker exception limit for process_win32_exec().
by nickm＠torproject.org 18 Oct '19

18 Oct '19

1 0

[tor/master] Handle errors from execve() in the Unix process backend more gracefully.
by nickm＠torproject.org 18 Oct '19

18 Oct '19

commit 85b4a5c27659a7d162c2e476e1e0dfbeefd73095 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 332b432c5..8191bdc1f 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

[tor/release-0.4.2] Ensure that the exit callback is called if CreateProcessA() fails on Windows.
by nickm＠torproject.org 18 Oct '19

18 Oct '19

1 0

[tor/release-0.4.2] Handle errors from execve() in the Unix process backend more gracefully.
by nickm＠torproject.org 18 Oct '19

18 Oct '19

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits October 2019