Backed out 2 changesets (bug 1752703) for causing spider-monkey failu…

…res in /mozglue/interposers/env_interposer.cpp CLOSED TREE Backed out changeset 621d691fcf43 (bug 1752703) Backed out changeset a53bc961d958 (bug 1752703)
dothq · May 10, 2023 · 0fa06ef · 0fa06ef
1 parent 1fa9fe4
commit 0fa06ef
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 177 deletions.
diff --git a/browser/app/moz.build b/browser/app/moz.build
@@ -53,6 +53,11 @@ LOCAL_INCLUDES += [
     "/xpcom/build",
 ]
 
+# The pthred_create() interposer needs to be linked as early as possible so
+# that it will appear before libpthread when resolving symbols.
+if CONFIG["OS_ARCH"] == "Linux" and CONFIG["MOZ_CRASHREPORTER"]:
+    USE_LIBS += ["pthread_create_interposer"]
+
 if CONFIG["LIBFUZZER"]:
     USE_LIBS += ["fuzzer"]
     LOCAL_INCLUDES += [

diff --git a/ipc/app/moz.build b/ipc/app/moz.build
@@ -16,6 +16,11 @@ else:
         "MozillaRuntimeMain.cpp",
     ]
 
+# The pthred_create() interposer needs to be linked as early as possible so
+# that it will appear before libpthread when resolving symbols.
+if CONFIG["OS_ARCH"] == "Linux" and CONFIG["MOZ_CRASHREPORTER"]:
+    USE_LIBS += ["pthread_create_interposer"]
+
 include("/ipc/chromium/chromium-config.mozbuild")
 
 LOCAL_INCLUDES += [

diff --git a/js/src/make-source-package.py b/js/src/make-source-package.py
@@ -155,7 +155,6 @@ def parse_version(topsrc_dir):
 
 + /mozglue/baseprofiler/**
 + /mozglue/build/**
-+ /mozglue/interposers/**
 + /mozglue/misc/**
 + /mozglue/moz.build
 + /mozglue/static/**

diff --git a/js/xpconnect/shell/moz.build b/js/xpconnect/shell/moz.build
@@ -10,6 +10,11 @@ SOURCES += [
     "xpcshell.cpp",
 ]
 
+# The pthred_create() interposer needs to be linked as early as possible so
+# that it will appear before libpthread when resolving symbols.
+if CONFIG["OS_ARCH"] == "Linux" and CONFIG["MOZ_CRASHREPORTER"]:
+    USE_LIBS += ["pthread_create_interposer"]
+
 if CONFIG["LIBFUZZER"]:
     USE_LIBS += ["fuzzer"]
 

diff --git a/mozglue/interposers/InterposerHelper.h b/mozglue/interposers/InterposerHelper.h
diff --git a/mozglue/interposers/env_interposer.cpp b/mozglue/interposers/env_interposer.cpp
diff --git a/mozglue/interposers/moz.build b/mozglue/interposers/moz.build
diff --git a/mozglue/moz.build b/mozglue/moz.build
@@ -13,9 +13,6 @@ if CONFIG["MOZ_LINKER"] or CONFIG["MOZ_WIDGET_TOOLKIT"] == "android":
 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "android":
     DIRS += ["android"]
 
-if CONFIG["OS_ARCH"] == "Linux":
-    DIRS += ["interposers"]
-
 DIRS += [
     "baseprofiler",
     "build",

diff --git a/toolkit/crashreporter/moz.build b/toolkit/crashreporter/moz.build
@@ -53,6 +53,7 @@ if CONFIG["MOZ_CRASHREPORTER"]:
             "google-breakpad/src/common",
             "google-breakpad/src/common/linux",
             "google-breakpad/src/processor",
+            "pthread_create_interposer",
         ]
 
         if CONFIG["MOZ_OXIDIZED_BREAKPAD"]:

diff --git a/toolkit/crashreporter/pthread_create_interposer/moz.build b/toolkit/crashreporter/pthread_create_interposer/moz.build
@@ -0,0 +1,12 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+Library("pthread_create_interposer")
+
+NoVisibilityFlags()
+
+UNIFIED_SOURCES += [
+    "pthread_create_interposer.cpp",
+]
diff --git a/...interposers/pthread_create_interposer.cpp → ..._interposer/pthread_create_interposer.cpp b/...interposers/pthread_create_interposer.cpp → ..._interposer/pthread_create_interposer.cpp
@@ -4,6 +4,7 @@
 
 #include <algorithm>
 
+#include <dlfcn.h>
 #include <pthread.h>
 #include <signal.h>
 #include <stdlib.h>
@@ -12,8 +13,6 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/DebugOnly.h"
 
-#include "InterposerHelper.h"
-
 using mozilla::DebugOnly;
 
 struct SigAltStack {
@@ -84,12 +83,30 @@ void* set_alt_signal_stack_and_start(PthreadCreateParams* params) {
   return thread_rv;
 }
 
+using pthread_create_func_t = int (*)(pthread_t*, const pthread_attr_t*,
+                                      void* (*)(void*), void*);
+
 extern "C" {
 // This interposer replaces libpthread's pthread_create() so that we can
 // inject an alternate signal stack in every new thread.
-MFBT_API int pthread_create(pthread_t* thread, const pthread_attr_t* attr,
-                            void* (*start_routine)(void*), void* arg) {
-  static const auto real_pthread_create = GET_REAL_SYMBOL(pthread_create);
+__attribute__((visibility("default"))) int pthread_create(
+    pthread_t* thread, const pthread_attr_t* attr,
+    void* (*start_routine)(void*), void* arg) {
+  // static const pthread_create_func_t real_pthread_create =
+  static const pthread_create_func_t real_pthread_create =
+      (pthread_create_func_t)dlsym(RTLD_NEXT, "pthread_create");
+
+  if (real_pthread_create == nullptr) {
+    MOZ_CRASH(
+        "pthread_create() interposition failed but the interposer function is "
+        "still being called, this won't work!");
+  }
+
+  if (real_pthread_create == pthread_create) {
+    MOZ_CRASH(
+        "We could not obtain the real pthread_create(). Calling the symbol we "
+        "got would make us enter an infinte loop so stop here instead.");
+  }
 
   PthreadCreateParams* params =
       (PthreadCreateParams*)malloc(sizeof(PthreadCreateParams));