diff options
| author | mdempsky@chromium.org <mdempsky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-03 07:51:22 +0000 |
|---|---|---|
| committer | mdempsky@chromium.org <mdempsky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-03 07:51:22 +0000 |
| commit | 65af1a74e2a057fbbd62678f49703165f091edce (patch) | |
| tree | 444ba427288c36e35c14a6b1897b1f652f1a5ca7 /sandbox | |
| parent | 9f630fc565b100282bfea63945ed57977701a7f9 (diff) | |
| download | chromium_src-65af1a74e2a057fbbd62678f49703165f091edce.zip chromium_src-65af1a74e2a057fbbd62678f49703165f091edce.tar.gz chromium_src-65af1a74e2a057fbbd62678f49703165f091edce.tar.bz2 | |
Handle waitpid returning EINTR.
Review URL: https://codereview.chromium.org/184963002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254434 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox')
| -rw-r--r-- | sandbox/linux/suid/client/setuid_sandbox_client.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.cc b/sandbox/linux/suid/client/setuid_sandbox_client.cc index 740823a..224f754 100644 --- a/sandbox/linux/suid/client/setuid_sandbox_client.cc +++ b/sandbox/linux/suid/client/setuid_sandbox_client.cc @@ -129,7 +129,7 @@ bool SetuidSandboxClient::ChrootMe() { // We need to reap the chroot helper process in any event. pid_t helper_pid = GetHelperPID(env_); // If helper_pid is -1 we wait for any child. - if (waitpid(helper_pid, NULL, 0) < 0) { + if (HANDLE_EINTR(waitpid(helper_pid, NULL, 0)) < 0) { PLOG(ERROR) << "Failed to wait for setuid helper to die"; return false; } @@ -182,4 +182,3 @@ void SetuidSandboxClient::SetupLaunchEnvironment() { } } // namespace sandbox - |