| Index: content/zygote/zygote_main_linux.cc
|
| diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc
|
| index 02beffae8a89ff2488c5be74efc600316fb31f06..29096c943c83864740985c379c7006416e341eea 100644
|
| --- a/content/zygote/zygote_main_linux.cc
|
| +++ b/content/zygote/zygote_main_linux.cc
|
| @@ -438,10 +438,9 @@ static bool EnterSuidSandbox(sandbox::SetuidSandboxClient* setuid_sandbox,
|
| return false;
|
|
|
| if (setuid_sandbox->IsInNewPIDNamespace()) {
|
| - CHECK_EQ(1, getpid())
|
| - << "The SUID sandbox created a new PID namespace but Zygote "
|
| - "is not the init process. Please, make sure the SUID "
|
| - "binary is up to date.";
|
| + // The SUID sandbox created a new PID namespace but Zygote is not the init
|
| + // process. Please, make sure the SUID binary is up to date.
|
| + CHECK_EQ(1, getpid());
|
| }
|
|
|
| if (getpid() == 1) {
|
| @@ -557,8 +556,8 @@ static void EnterLayerOneSandbox(LinuxSandbox* linux_sandbox,
|
| sandbox::SetuidSandboxClient* setuid_sandbox =
|
| linux_sandbox->setuid_sandbox_client();
|
| if (setuid_sandbox->IsSuidSandboxChild()) {
|
| - CHECK(EnterSuidSandbox(setuid_sandbox, post_fork_parent_callback))
|
| - << "Failed to enter setuid sandbox";
|
| + // Failed to enter setuid sandbox
|
| + CHECK(EnterSuidSandbox(setuid_sandbox, post_fork_parent_callback));
|
| } else if (sandbox::NamespaceSandbox::InNewUserNamespace()) {
|
| EnterNamespaceSandbox(linux_sandbox, post_fork_parent_callback);
|
| } else {
|
|
|