diff options
| author | Alexander Færøy <ahf@torproject.org> | 2019-10-17 16:39:05 +0200 |
|---|---|---|
| committer | Alexander Færøy <ahf@torproject.org> | 2019-10-17 16:39:05 +0200 |
| commit | 9915b8f0bc3e6a1b6c8413fbb87c41137ea89104 (patch) | |
| tree | cedb63cb3ac7f2b4207ed392769033b622c6bf69 | |
| parent | e483257e1bc826b5678fcbf13084fd5d811f2b12 (diff) | |
| download | tor-9915b8f0bc3e6a1b6c8413fbb87c41137ea89104.tar.gz tor-9915b8f0bc3e6a1b6c8413fbb87c41137ea89104.zip | |
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
| -rw-r--r-- | changes/bug31810 | 4 | ||||
| -rw-r--r-- | 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 0000000000..628d12f09b --- /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 790ab897e9..b102afff44 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. */ |