diff options
author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-14 08:38:32 +0000 |
---|---|---|
committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-14 08:38:32 +0000 |
commit | 353f5ed3bb2abac8c59cd39d39ca5f5ed3685c28 (patch) | |
tree | c9a16ef4e368ec91dd14d714815cf25aef8fae89 /sandbox/linux/suid/sandbox.c | |
parent | e6666435b48e79be7a8a9567de059ca9c5700236 (diff) | |
download | chromium_src-353f5ed3bb2abac8c59cd39d39ca5f5ed3685c28.zip chromium_src-353f5ed3bb2abac8c59cd39d39ca5f5ed3685c28.tar.gz chromium_src-353f5ed3bb2abac8c59cd39d39ca5f5ed3685c28.tar.bz2 |
Revert r251271 "Setuid sandbox: exit(2) on SIGABRT" Make Linux build again.
TBR=jln
Review URL: https://codereview.chromium.org/166303002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251273 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox/linux/suid/sandbox.c')
-rw-r--r-- | sandbox/linux/suid/sandbox.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/sandbox/linux/suid/sandbox.c b/sandbox/linux/suid/sandbox.c index 78c9e06..2dd78ef 100644 --- a/sandbox/linux/suid/sandbox.c +++ b/sandbox/linux/suid/sandbox.c @@ -58,12 +58,6 @@ static void FatalError(const char *msg, ...) { _exit(1); } -static void ExitWithErrorSignalHandler(int signal) { - const char msg[] = "\nThe setuid sandbox got signaled, exiting.\n"; - (void) write(2, msg, sizeof(msg) - 1); - _exit(1); -} - // We will chroot() to the helper's /proc/self directory. Anything there will // not exist anymore if we make sure to wait() for the helper. // @@ -201,15 +195,6 @@ static void WaitForChildAndExit(pid_t child_pid) { int exit_code = -1; siginfo_t reaped_child_info; - // Don't "Core" on SIGABRT. SIGABRT is sent by the Chrome OS session manager - // when things are hanging. - // Here, the current process is going to waitid() and _exit(), so there is no - // point in generating a crash report. The child process is the one - // blocking us. - if (signal(SIGABRT, ExitWithErrorSignalHandler) == SIG_ERR) { - FatalError("Failed to change signal handler"); - } - int wait_ret = HANDLE_EINTR(waitid(P_PID, child_pid, &reaped_child_info, WEXITED)); |