Merge pull request #76 from supervacuus/meta/update

meta: update 2022-12-12

Author: Swatinem

CMakeLists.txt

@@ -25,13 +25,20 @@ if(CRASHPAD_ZLIB_SYSTEM)
     find_package(ZLIB REQUIRED)
 endif()
 
+
 if(LINUX OR ANDROID)
     find_package(OpenSSL)
     if(OPENSSL_FOUND)
         set(CRASHPAD_USE_BORINGSSL ON)
     endif()
 endif()
 
+if (NOT (ANDROID OR FUCHSIA))
+    add_compile_definitions(CRASHPAD_FLOCK_ALWAYS_SUPPORTED=1)
+else()
+    add_compile_definitions(CRASHPAD_FLOCK_ALWAYS_SUPPORTED=0)
+endif()
+
 include(GNUInstallDirs)
 set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/crashpad")
 

DEPS

@@ -15,6 +15,9 @@
 vars = {
   'chromium_git': 'https://chromium.googlesource.com',
   'gn_version': 'git_revision:2ecd43a10266bd091c98e6dcde507c64f6a0dad3',
+  # ninja CIPD package version.
+  # https://chrome-infra-packages.appspot.com/p/infra/3pp/tools/ninja
+  'ninja_version': 'version:[email protected]',
   'pull_linux_clang': False,
   'pull_win_toolchain': False,
   # Controls whether crashpad/build/ios/setup-ios-gn.py is run as part of
@@ -133,6 +136,51 @@ deps = {
     'condition': 'checkout_fuchsia and host_os == "linux"',
     'dep_type': 'cipd'
   },
+  # depot_tools/ninja wrapper calls third_party/ninja/{ninja, ninja.exe}.
+  # crashpad/third_party/ninja/ninja is another wrapper to call linux ninja
+  # or mac ninja.
+  # This allows crashpad developers to work for multiple platforms on the same
+  # machine.
+  'crashpad/third_party/ninja': {
+    'packages': [
+      {
+        'package': 'infra/3pp/tools/ninja/${{platform}}',
+        'version': Var('ninja_version'),
+      }
+    ],
+    'condition': 'host_os == "win"',
+    'dep_type': 'cipd',
+  },
+  'crashpad/third_party/ninja/linux': {
+    'packages': [
+      {
+        'package': 'infra/3pp/tools/ninja/${{platform}}',
+        'version': Var('ninja_version'),
+      }
+    ],
+    'condition': 'host_os == "linux"',
+    'dep_type': 'cipd',
+  },
+  'crashpad/third_party/ninja/mac-amd64': {
+    'packages': [
+      {
+        'package': 'infra/3pp/tools/ninja/mac-amd64',
+        'version': Var('ninja_version'),
+      }
+    ],
+    'condition': 'host_os == "mac" and host_cpu == "x64"',
+    'dep_type': 'cipd',
+  },
+  'crashpad/third_party/ninja/mac-arm64': {
+    'packages': [
+      {
+        'package': 'infra/3pp/tools/ninja/mac-arm64',
+        'version': Var('ninja_version'),
+      }
+    ],
+    'condition': 'host_os == "mac" and host_cpu == "arm64"',
+    'dep_type': 'cipd',
+  },
   'crashpad/third_party/win/toolchain': {
     # This package is only updated when the solution in .gclient includes an
     # entry like:

build/BUILD.gn

@@ -30,6 +30,12 @@ config("crashpad_is_in_fuchsia") {
   }
 }
 
+config("flock_always_supported_defines") {
+  defines = [
+    "CRASHPAD_FLOCK_ALWAYS_SUPPORTED=$crashpad_flock_always_supported",
+  ]
+}
+
 group("default_exe_manifest_win") {
   if (crashpad_is_in_chromium) {
     deps = [ "//build/win:default_exe_manifest" ]

build/crashpad_buildconfig.gni

@@ -81,6 +81,8 @@ if (crashpad_is_in_chromium) {
   crashpad_is_clang = mini_chromium_is_clang
 }
 
+crashpad_flock_always_supported = !(crashpad_is_android || crashpad_is_fuchsia)
+
 template("crashpad_executable") {
   executable(target_name) {
     forward_variables_from(invoker,

client/BUILD.gn

@@ -144,6 +144,7 @@ static_library("common") {
     "../util",
   ]
   deps = [ "../util" ]
+  configs += [ "../build:flock_always_supported_defines" ]
 }
 
 source_set("client_test") {

client/crash_report_database_generic.cc

@@ -549,6 +549,16 @@ int CrashReportDatabaseGeneric::CleanDatabase(time_t lockfile_ttl) {
   removed += CleanReportsInState(kPending, lockfile_ttl);
   removed += CleanReportsInState(kCompleted, lockfile_ttl);
   CleanOrphanedAttachments();
+#if !CRASHPAD_FLOCK_ALWAYS_SUPPORTED
+  base::FilePath settings_path(kSettings);
+  if (Settings::IsLockExpired(settings_path, lockfile_ttl)) {
+    base::FilePath lockfile_path(settings_path.value() +
+                                 Settings::kLockfileExtension);
+    if (LoggingRemoveFile(lockfile_path)) {
+      ++removed;
+    }
+  }
+#endif  // !CRASHPAD_FLOCK_ALWAYS_SUPPORTED
   return removed;
 }
 

client/crashpad_client_linux.cc

@@ -180,8 +180,10 @@ class SignalHandler {
 
     DCHECK(!handler_);
     handler_ = this;
-    return Signals::InstallCrashHandlers(
-        HandleOrReraiseSignal, SA_ONSTACK, &old_actions_, unhandled_signals);
+    return Signals::InstallCrashHandlers(HandleOrReraiseSignal,
+                                         SA_ONSTACK | SA_EXPOSE_TAGBITS,
+                                         &old_actions_,
+                                         unhandled_signals);
   }
 
   const ExceptionInformation& GetExceptionInfo() {

client/crashpad_client_linux_test.cc

@@ -20,6 +20,7 @@
 #include <stdlib.h>
 #include <sys/syscall.h>
 #include <sys/types.h>
+#include <sys/utsname.h>
 #include <unistd.h>
 
 #include "base/check_op.h"
@@ -69,6 +70,7 @@ enum class CrashType : uint32_t {
   kSimulated,
   kBuiltinTrap,
   kInfiniteRecursion,
+  kSegvWithTagBits,
 };
 
 struct StartHandlerForSelfTestOptions {
@@ -170,6 +172,10 @@ void ValidateExtraMemory(const StartHandlerForSelfTestOptions& options,
     }
   }
   EXPECT_EQ(pc_found, options.gather_indirectly_referenced_memory);
+
+  if (options.crash_type == CrashType::kSegvWithTagBits) {
+    EXPECT_EQ(exception->ExceptionAddress(), 0xefull << 56);
+  }
 }
 
 void ValidateDump(const StartHandlerForSelfTestOptions& options,
@@ -213,6 +219,12 @@ void ValidateDump(const StartHandlerForSelfTestOptions& options,
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Winfinite-recursion"
+// Clang (masquerading as gcc) is too smart, and removes the recursion
+// otherwise. May need to change if either clang or another compiler becomes
+// smarter.
+#if defined(COMPILER_GCC)
+__attribute__((noinline))
+#endif
 int RecurseInfinitely(int* ptr) {
   int buf[1 << 20];
   return *ptr + RecurseInfinitely(buf);
@@ -236,16 +248,28 @@ void DoCrash(const StartHandlerForSelfTestOptions& options,
   }
 
   switch (options.crash_type) {
-    case CrashType::kSimulated:
+    case CrashType::kSimulated: {
       CRASHPAD_SIMULATE_CRASH();
       break;
+    }
 
-    case CrashType::kBuiltinTrap:
+    case CrashType::kBuiltinTrap: {
       __builtin_trap();
+    }
 
-    case CrashType::kInfiniteRecursion:
+    case CrashType::kInfiniteRecursion: {
       int val = 42;
       exit(RecurseInfinitely(&val));
+    }
+
+    case CrashType::kSegvWithTagBits: {
+      volatile char* x = nullptr;
+#ifdef __aarch64__
+      x += 0xefull << 56;
+#endif  // __aarch64__
+      *x;
+      break;
+    }
   }
 }
 
@@ -268,7 +292,7 @@ class ScopedAltSignalStack {
 
   void Initialize() {
     ScopedMmap local_stack_mem;
-    constexpr size_t stack_size = MINSIGSTKSZ;
+    const size_t stack_size = MINSIGSTKSZ;
     ASSERT_TRUE(local_stack_mem.ResetMmap(nullptr,
                                           stack_size,
                                           PROT_READ | PROT_WRITE,
@@ -410,6 +434,9 @@ class StartHandlerForSelfInChildTest : public MultiprocessExec {
           SetExpectedChildTermination(TerminationReason::kTerminationSignal,
                                       SIGSEGV);
           break;
+        case CrashType::kSegvWithTagBits:
+          SetExpectedChildTermination(TerminationReason::kTerminationSignal,
+                                      SIGSEGV);
       }
     }
   }
@@ -486,6 +513,27 @@ TEST_P(StartHandlerForSelfTest, StartHandlerInChild) {
     GTEST_SKIP();
   }
 #endif  // defined(ADDRESS_SANITIZER)
+
+  if (Options().crash_type == CrashType::kSegvWithTagBits) {
+#if !defined(ARCH_CPU_ARM64)
+    GTEST_SKIP() << "Testing for tag bits only exists on aarch64.";
+#else
+    struct utsname uname_info;
+    ASSERT_EQ(uname(&uname_info), 0);
+    ASSERT_NE(uname_info.release, nullptr);
+
+    char* release = uname_info.release;
+    unsigned major = strtoul(release, &release, 10);
+    ASSERT_EQ(*release++, '.');
+    unsigned minor = strtoul(release, nullptr, 10);
+
+    if (major < 5 || (major == 5 && minor < 11)) {
+      GTEST_SKIP() << "Linux kernel v" << uname_info.release
+                   << " does not support SA_EXPOSE_TAGBITS";
+    }
+#endif  // !defined(ARCH_CPU_ARM64)
+  }
+
   StartHandlerForSelfInChildTest test(Options());
   test.Run();
 }
@@ -500,7 +548,8 @@ INSTANTIATE_TEST_SUITE_P(
                      testing::Bool(),
                      testing::Values(CrashType::kSimulated,
                                      CrashType::kBuiltinTrap,
-                                     CrashType::kInfiniteRecursion)));
+                                     CrashType::kInfiniteRecursion,
+                                     CrashType::kSegvWithTagBits)));
 
 // Test state for starting the handler for another process.
 class StartHandlerForClientTest {