diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-20 10:33:36 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-22 11:45:12 +0000 |
| commit | be59a35641616a4cf23c4a13fa0632624b021c1b (patch) | |
| tree | 9da183258bdf9cc413f7562079d25ace6955467f /chromium/content/zygote | |
| parent | d702e4b6a64574e97fc7df8fe3238cde70242080 (diff) | |
| download | qtwebengine-chromium-be59a35641616a4cf23c4a13fa0632624b021c1b.tar.gz | |
BASELINE: Update Chromium to 62.0.3202.101
Change-Id: I2d5eca8117600df6d331f6166ab24d943d9814ac
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/content/zygote')
| -rw-r--r-- | chromium/content/zygote/zygote_linux.cc | 2 | ||||
| -rw-r--r-- | chromium/content/zygote/zygote_main_linux.cc | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/chromium/content/zygote/zygote_linux.cc b/chromium/content/zygote/zygote_linux.cc index 1fe8ed728e3..5fe541a1e1a 100644 --- a/chromium/content/zygote/zygote_linux.cc +++ b/chromium/content/zygote/zygote_linux.cc @@ -24,7 +24,7 @@ #include "base/pickle.h" #include "base/posix/eintr_wrapper.h" #include "base/posix/global_descriptors.h" -#include "base/posix/unix_domain_socket_linux.h" +#include "base/posix/unix_domain_socket.h" #include "base/process/kill.h" #include "base/process/launch.h" #include "base/process/process.h" diff --git a/chromium/content/zygote/zygote_main_linux.cc b/chromium/content/zygote/zygote_main_linux.cc index 6310291b28f..5759285237e 100644 --- a/chromium/content/zygote/zygote_main_linux.cc +++ b/chromium/content/zygote/zygote_main_linux.cc @@ -25,7 +25,7 @@ #include "base/native_library.h" #include "base/pickle.h" #include "base/posix/eintr_wrapper.h" -#include "base/posix/unix_domain_socket_linux.h" +#include "base/posix/unix_domain_socket.h" #include "base/rand_util.h" #include "base/strings/safe_sprintf.h" #include "base/strings/string_number_conversions.h" @@ -477,9 +477,11 @@ static void EnterLayerOneSandbox(LinuxSandbox* linux_sandbox, ZygotePreSandboxInit(); - // Check that the pre-sandbox initialization didn't spawn threads. +// Check that the pre-sandbox initialization didn't spawn threads. +// It's not just our code which may do so - some system-installed libraries +// are known to be culprits, e.g. lttng. #if !defined(THREAD_SANITIZER) - DCHECK(sandbox::ThreadHelpers::IsSingleThreaded()); + CHECK(sandbox::ThreadHelpers::IsSingleThreaded()); #endif sandbox::SetuidSandboxClient* setuid_sandbox = |